b4ae142149
Remove printf escaping (we will realize it differently) and ensure we're using single quotes for strings (although double quotes are possible, too)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 20:54:01 +02:00
3fe43ce1d9
Rely on default value (database provided) for date_added when adding a new domain
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 18:16:04 +02:00
8524aecfed
Don't set gravity database permissions
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:56:11 +02:00
e04dc9d2bb
Remove sqlitekey variable as the first column of the regex table is now called domain as well
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:44:42 +02:00
3dcb9722d3
Remove global haveSourceUrls variable and just skip downloading and processing adlists if there aren't any to be downloaded
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:39:35 +02:00
bd0215524b
Add vw_adlists view which returns only enabled adlists
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:36:00 +02:00
53e3ff2b24
Only add non-empty lines when moving file content into database tables
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:32:05 +02:00
5bb8163674
Change type of whitelist, blacklist, regex, and adlists time column to INTEGER and insert a DEFAULT clause that returns the current Unix time as such an integer
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:26:15 +02:00
a891d64395
We should always exit after displaying a list, even if it is empty
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:13:36 +02:00
6b1d2523e8
Also print datetime a domain was added when listing the domains on the CLI
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:07:16 +02:00
08ee9526ad
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 17:06:01 +02:00
0efc46260f
Use both old and new strings for detecting whether this is a Pi-hole dnsmasq config file
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-26 16:16:30 +02:00
6a01a1257f
Merge pull request #2597 from xCh12i5/RegEx-Fix
...
Solves RegEx issue.
2019-04-25 15:27:35 +02:00
a2a7e80007
Add --web for sending a confirmation string when executed from the web interface. This is necessary as the "Reloading DNS service" message does not always propagate through to the web interface when reloading pihole-FTL takes a while.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 15:01:13 +02:00
cce66a13b6
Fix output in list.sh when adding a domain that is already present in the target list
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 14:54:41 +02:00
43bced7997
Add more comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 12:45:08 +02:00
788cd78321
Reduce code duplication and add special handling of | character as it might appear in regex filter string
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 12:30:38 +02:00
e5d1cb5a2e
Rewrite list.sh to operate on database-based lists
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 12:10:42 +02:00
d94bbfca7f
Finish migrating gravity.db to using our new gravity database. This removes the --skip-download, --blacklist-only, --whitelist-only, and --wildcard-only options as it is not necessary to run gravity when modifying them from now on (gravity really only builds the gravity database and the local.list file).
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 11:23:06 +02:00
465a39427b
Source adlists from gravity database
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 10:46:18 +02:00
2664ac0efc
Improve error reporting
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 10:18:37 +02:00
c1277705d8
Copy existing whitelist.txt, blacklist.txt, regex.list, and adlists.list to the database. We remove the files afterwards as the content lives in the database now
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-25 10:14:45 +02:00
61cfd2f9f9
Add adlists table
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-24 19:48:06 +02:00
ee4dabeca6
Merge branch 'development' into new/gravitydb
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-24 19:12:19 +02:00
e57d0fb93c
Remove the empty templates gravity.list, white.list, black.list. The old source files whitelist.txt, blacklist.txt, and regex.list still exist and need to be removed in a follow-up commit
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-24 19:05:08 +02:00
ee20164207
Remove detect_pihole_blocking_status() as we can modify the database at any time
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-24 19:01:31 +02:00
d7ee44960e
Remove moving around of the gravity and blacklist files as we do not use them any longer
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-24 18:57:38 +02:00
c13ebd3a9d
Replace Pi-hole ID string with another line we intend to keep
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-24 18:55:25 +02:00
6594a0a6e7
Fix detection of blocked query in pihole -t
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-24 18:53:20 +02:00
de44563301
Remove addn-hosts from 01-pihole.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-24 18:51:38 +02:00
e3d9cf0ac1
Merge pull request #2718 from Piskvor/basic-install-package-manager-typo
...
Show $UPDATE_PKG_CACHE content in error message.
2019-04-24 10:17:23 +02:00
bd572d8843
Merge pull request #2717 from pi-hole/fix/teleporter-extension
...
Fix teleporter backup file extension
2019-04-23 13:23:43 -04:00
037737d653
Show $UPDATE_PKG_CACHE content in error message.
...
Fixes the typo in update_package_cache(), where the error message
contained the color code twice, instead of the $UPDATE_PKG_CACHE text.
Signed-off-by: Jan Piskvor Martinec <github@piskvor.org >
2019-04-23 16:02:25 +02:00
d2c7c426de
Fix teleporter backup file extension
...
Fixes #2714
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com >
2019-04-22 19:43:26 -07:00
1d09c6e47d
Merge pull request #2709 from pi-hole/fix/checkout_indentation
...
Fix pihole checkout indentation
2019-04-16 22:51:01 -04:00
84244b7cd5
Fix indentation in display of branches available during pihole checkout
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-04-16 18:30:04 +02:00
422680ee9f
Fix chronometer refresh incorrectly reading the long argument sleep time
...
`-r` worked, but `--refresh` did not.
Fixes #2703
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-04-14 13:03:25 -07:00
42c7653e99
Merge pull request #2696 from pi-hole/tweak/FTL-privacy-doc-link
...
Add a link to the documentation on FTL privacy levels during install
2019-04-07 15:12:10 -04:00
78c0c58946
Add a link to the documentation on FTL privacy levels during install
...
Closes #2695
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-04-07 12:00:43 -07:00
cae61614f4
Merge pull request #2688 from pi-hole/fix/2687
...
Add Check to `pihole -q -exact` to ensure there is no `#` char preceding a space before the domain
2019-03-28 23:20:41 -04:00
a7f6c9b3a0
Ignore matches that start # using negative lookbehind
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2019-03-29 00:08:04 +00:00
5950b4bb78
Merge pull request #2646 from pi-hole/fix/FTL_arch_detect_rpm
...
Don't fail when trying to detect OS architecture on RPM-based systems
2019-03-24 15:23:05 -04:00
817b19888f
Merge branch 'development' into fix/FTL_arch_detect_rpm
2019-03-23 08:55:46 +01:00
b64fb578fc
Merge pull request #2674 from NiGhTTraX/development
...
Fix uninstalling lighttpd when it's not installed
2019-03-15 22:11:34 -04:00
e9e92368b0
Fix uninstalling lighttpd when it's not installed
...
Signed-off-by: Andrei Picus <NiGhTTraX@users.noreply.github.com >
2019-03-15 15:05:58 +01:00
ffcb173a7f
Merge pull request #2672 from pi-hole/fix/test-version-pinning
...
Pin Python package versions to the versions in the last successful build
2019-03-15 07:04:40 -07:00
b9c9c2797f
Pin Python package versions to the versions in the last successful build
...
The last successful build was
https://travis-ci.org/pi-hole/pi-hole/builds/500825408
When `testinfra` became `2.0.0`, it removed the deprecated features that
the tests currently use.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-03-13 20:14:21 -07:00
204a4e459b
Merge pull request #2637 from TheNoim/patch-1
...
Support pi hole behind a reverse proxy with ssl
2019-03-13 22:12:00 -04:00
0a53e966ea
Merge pull request #2659 from pi-hole/tweak/warn_if_FTL_not_on_master
...
Warn user during update if FTL is on a custom branch
2019-03-03 09:34:11 +01:00
2e17c23333
Don't warn if user is on development as this branch is constantly updated
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-03-02 16:40:59 +01:00
