c944f6a320
Add a new migration script to fix the previous one
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-12-29 23:32:31 +00:00
aa4c0ff329
Don't create trigger with duplicate name until after old table is deleted
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-12-29 20:35:11 +00:00
37217ece73
Merge pull request #3049 from pi-hole/tweak/unique_group_name
...
Group table enhancements
2019-12-28 14:19:04 +01:00
cda0133dd1
Revert "Change the regex used for domain validation"
...
This reverts commit 76460f01e9
2019-12-21 11:15:18 +00:00
eda7f40fef
Reinstall trigger that prevents group zero from being deleted.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-20 00:42:59 +00:00
e589e665a7
Also add date_added and date_modified fields to group table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-20 00:21:25 +00:00
b32b5ad6e9
Update gravity database to version 8. This enforces uniqueness on the group name.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-20 00:09:10 +00:00
e2de199f47
Merge pull request #3037 from pi-hole/new/group_zero
...
Add special group zero to gravity database
2019-12-18 22:36:43 +01:00
a1633123aa
Merge pull request #3035 from pi-hole/fix/query_gravity
...
pihole -q should also scan gravity table
2019-12-16 01:45:10 +01:00
2444296348
Again, Mr. Stickler
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-15 11:55:19 +00:00
4be7ebe61f
Scan domainlist instead of view to also catch disabled domains.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-15 11:47:53 +00:00
a720fe1789
Add client trigger.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-12 22:49:21 +00:00
0b0ec43bf5
Merge pull request #3036 from pi-hole/fix/reload-lists
...
Improve list reloading
2019-12-12 21:37:09 +01:00
f0439c8d12
Add special group zero to gravity database.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-12 16:39:02 +00:00
40e8657137
Please Mr. Stickler
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-12 11:18:46 +00:00
52dd72dfa5
Ensure output is always correct and also display if domain has been found but is disabled
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-12 11:08:19 +00:00
922ce7359c
pihole -q should also scan gravity table
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-12 10:58:41 +00:00
5457b2c6ea
Merge pull request #2935 from pi-hole/new/internal-blocking
...
Per-client blocking changes
2019-12-12 09:49:02 +01:00
69a909fc4c
On modification of lists, we should send real-time signal 0 instead of SIGHUP. This also preserves the DNS cache of not-blocked domains.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-11 21:47:46 +00:00
ec09b5843c
Merge branch 'development' into fix/do_not_force_local_resolver
2019-12-11 19:09:02 +00:00
f482156cca
Merge branch 'development' into new/internal-blocking
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-09 16:49:16 +00:00
620e1e9c73
Do not force nameserver 127.0.0.1 through resolvconf in pihole-FTL.service
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-09 12:23:42 +00:00
8a119d72e2
Ensure database permissions are set up correctly by the service script.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-09 12:17:55 +00:00
807a5cfb23
Merge pull request #3015 from pi-hole/tweak/domainlist_table
...
Unite four domain tables into a single domainlist table.
2019-12-08 16:50:22 +01:00
54d0b9a1b8
Serve JS files with utf-8 charset too
...
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2019-12-07 13:48:25 +02:00
eaf1244932
:dominik: Detect binary name before calling FTLcheckUpdate in update.sh
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-12-04 20:10:46 +00:00
b6cd7b8e3d
Use more descriptive names instead of directly using the IDs in list.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-12-02 17:27:32 +00:00
869473172c
remove _ from regex descibers
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-12-01 12:50:24 +00:00
63e407cfdc
Update advanced/Scripts/list.sh
...
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
2019-12-01 12:45:22 +00:00
0251117c77
Update advanced/Scripts/list.sh
...
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
2019-12-01 12:45:06 +00:00
44e1455b12
Update advanced/Scripts/list.sh
...
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
2019-12-01 12:44:48 +00:00
76460f01e9
Change the regex used for domain validation
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-30 17:45:07 +00:00
4b8a72fda7
functionise parameter discovery
...
Rename HandleOther to ValidateDomain
Capital letters on the new functions
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-30 16:26:26 +00:00
edaee4e962
remove redundant function and comments
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-30 16:02:50 +00:00
77bfb3fb67
tidy up variable usage in list.sh Remove some that are redundant
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-30 14:18:12 +00:00
6a881545b0
tweak wording Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-30 13:25:32 +00:00
d0de5fda30
Simplify removal of domain from one list when it is requested for another
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-30 13:13:26 +00:00
a1f120b2ff
Address stickler's complaint
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-30 12:43:07 +00:00
185319d560
Unite four domain tables into a single domainlist table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-30 12:33:51 +00:00
5c6dd3f6f4
Merge pull request #2978 from Mograine/patch-1
...
Add commands to add/remove custom DNS records
2019-11-29 13:25:09 +01:00
edcdf9f619
Merge pull request #3003 from pi-hole/fix/tbd
...
FTL always determined.
2019-11-27 09:46:17 +00:00
c809c34024
Add user feedback
...
Signed-off-by: Mograine <ghiot.pierre@gmail.com>
2019-11-27 00:28:44 +01:00
037d52104a
New command "pihole -g -r" recreates gravity.db based on files backed up in /etc/pihole/migration_update. This is useful to restore a working version of the database when the user destroyed the original database. Also, update gravity.db to version 5 because of a fix we needed to implement.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-26 10:58:39 +01:00
eeb26e3975
Merge pull request #2990 from chrunchyjesus/unix-compliance
...
make some shebangs comply to posix standard
2019-11-16 12:26:49 +00:00
12817c09bb
(Squashed commits)
...
Always ensure we have the correct machine arch by storing to/reading from a file rather than depending on global variable that for some reason is not always populated...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
no need for global variable
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Use a file in the temporary FTL download directory
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Local binary variable named to l_binary. Disambiguate from global binary.
Allow 'binary' to be shadowed for testing.
Use ./ftlbinary in all operations.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Revert shadow ability on binary variable.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Remove unused tests, binary variable can not be overridden.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
This should work here, too
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
binary name is passed through from pihole checkout
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Add comments
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
OK, let's try it this way again
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
we might be getting somewhere.. squash after this I think!
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This is a test to see if it fixes the aarch64 test (we are definitely squashing these commits
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
fix the rest of the tests
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Remove trailing whitespace in the files we've touched here
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-15 19:49:09 +00:00
b93628acb3
Merge branch 'development' of https://github.com/Mograine/pi-hole into patch-1
2019-11-13 09:44:48 +01:00
7f7b9d089c
Merge pull request #2965 from pi-hole/tweak/BackendChangesForAdlistComments
...
backend changes to allow comment when adding new adlist
2019-11-12 21:50:19 +01:00
476975540a
make some shebangs comply to posix standard
2019-11-05 22:33:00 +01:00
193ff38ab3
Allow more precise deletion by passing ip as parameter
...
Signed-off-by: Mograine <ghiot.pierre@gmail.com>
2019-10-28 13:21:05 +01:00
bb8dbe9da5
Update 01-pihole.conf
...
Signed-off-by: Mograine <ghiot.pierre@gmail.com>
2019-10-27 16:55:54 +01:00
f9d16c2b15
Update webpage.sh
...
Signed-off-by: Mograine <ghiot.pierre@gmail.com>
2019-10-27 16:55:54 +01:00
c6f9fe3af2
Fix spelling of the word "permitting"
...
Signed-off-by: John Krull <john.a.krull@gmail.com>
2019-10-15 21:29:55 -05:00
5bac1ad58b
backend changes to allow comment when adding new adlist
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-10-14 22:59:58 +01:00
d883854aad
Use constant for long path.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-10-03 12:12:32 +02:00
756c99653e
Merge branch 'development' into new/internal-blocking
2019-10-03 12:01:27 +02:00
2e0370367c
Print when we upgrade gravity database version. This will make possibly failed upgrades easier to debug.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-26 14:02:20 +02:00
3cb4f6d9d4
We cannot create vw_gravity before having created vw_whitelist as the former depends onthe later. This commit changes the order in which the tables are created.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-26 13:50:54 +02:00
61a40c1b43
merge devel into 4.3.2 And Resolve merge conflicts
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-09-22 01:16:44 +01:00
a27c7b1398
regex white- and blacklist views need to be re-created as well as we need the ID for storing internally whether or not we try to match a given regex for a specific client.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-18 20:58:44 +02:00
7b48431917
Add client_by_group table like we have for the other lists. It stores associations between individual clients and list groups.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-09 00:03:57 +02:00
1f36ec48e3
Add use-application-dns.net = NXDOMAIN in ProcessDNSSettings rather than in the template so we can ensure that it will survive config-renewals.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-07 23:11:20 +02:00
ff08add7c0
Update vw_whitelist and vw_blacklist to return group_id alongside domain so we can filter if the current client wants to get this domain blocked or not.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-07 13:01:36 +02:00
ffc91a6c81
Update view vw_gravity to only return domains from enabled adlists.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-07 11:17:53 +02:00
525ec8cd01
Signal to Firefox that the local network is unsuitable for DNS-over-HTTPS
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-07 08:44:03 +02:00
a8af2e1837
Store domains without sorting and unifying them first. This allows us to preserve the relationship of the individual domains to the lists they came from.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-04 23:14:29 +02:00
aed2e35bc0
Print messages only after removing possible matches in comments.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-02 22:39:28 +02:00
a7b44426cd
Merge pull request #2838 from pi-hole/new/whitelist-regex-support
...
Whitelist regex support
2019-09-01 14:23:37 +02:00
b9fed8fca6
Merge pull request #2891 from niklasea/development
...
Restore 'pihole -q' hosts format support and improve matching in edge cases
2019-08-30 20:56:52 -07:00
d8eee47ca4
Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-28 22:10:26 -07:00
a3e32d9a15
Properly escape domain regex
...
Dots in domain names should not match any character.
Signed-off-by: Niklas Elmose Andersen <mail@niklasea.dk>
2019-08-27 12:13:28 +02:00
989d1aff60
Restore and improve 'pihole -q' matching
...
Removes regex lookaround which 'grep -E' does not support.
Restores support for blocklists in hosts format.
Simplifies domain match cleanup logic by eliminating an if-condition.
Improves domain matching by eliminating commented domain names,
eliminating false positives in a few edge cases.
Signed-off-by: Niklas Elmose Andersen <mail@niklasea.dk>
2019-08-26 20:39:56 +02:00
03c65dd0e9
Convert hardcoded /usr/local/bin to variable
...
Update pihole script with full path to 'pihole'
Variable for webpage.sh 'pihole' call.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2019-08-24 04:49:14 -07:00
6faddfcd3d
Print timestamps in local time zone of the Pi-hole.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-23 10:09:52 +02:00
1820c2c598
Merge branch 'development' into new/whitelist-regex-support
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-22 14:19:51 +02:00
23b688287f
Fix indentation in query.sh. No functional change in this commit.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-22 14:12:58 +02:00
42ccc1ef24
Add support for regex whitelist in "pihole -q".
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-22 14:06:42 +02:00
cc40c18f49
Wrap upgrade script commands in a transaction.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-22 13:54:46 +02:00
b1838512b2
Explicitly select columns (and their order) when listing the databaes tables. Print timestamps translated to strings instead of printing the integer timestamps.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-22 13:39:58 +02:00
e27f50b8e5
Try to obtain PID from PIDFILE. If this fails (file does not exist or is empty), fall back to using pidof + awk
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-21 04:38:58 -07:00
484f618685
Use last PID in case pidof returns multiple PIDs for pihole-FTL
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-21 04:38:55 -07:00
d3d45a8776
Fix 404 error when browsing to pi.hole (without /admin) (for fedora)
...
Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>
2019-08-20 11:29:20 -07:00
9f86fd0cb4
Fix for 404 error when browsing to pi.hole (without /admin)
...
Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>
2019-08-20 11:29:17 -07:00
3e78ed95d4
Fix displaying options for table "group" in the debugger.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-17 15:04:04 +02:00
20a839fef5
fixed local declaration before assignment
...
Signed-off-by: snapsl <chris.baller@gmx.de>
2019-08-15 11:20:55 +02:00
b2d8c4374b
tweaked code style of webpage.sh
...
Signed-off-by: snapsl <chris.baller@gmx.de>
2019-08-14 23:28:13 +02:00
dc93462d42
Group table has only two columns
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-06 20:28:00 +02:00
6e2e825a5f
Rename options "pihole --whiteregex" to "pihole --white-regex" for the sake of readability. The same applied for "whitewild" -> "white-wild"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-05 21:10:52 +02:00
af754e3fc4
Rearrange group tables directly next to the tables they refer to.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-05 21:08:36 +02:00
06860ed5b4
Group tables have only two columns.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-05 21:07:39 +02:00
09190c1735
Only check once for if this is a regex list or not.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-05 21:03:47 +02:00
a95b473417
Rearranage if statements to ensure the proper output is shown for wildcard-style filters.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-05 20:56:01 +02:00
6f58d58cae
Add --whitewild to help texts and man pages.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-22 22:26:27 +02:00
40d0caa70b
Add undocumented --whitewild option that does the same --wild does for the whitelist.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-22 21:15:28 +02:00
0692be9bae
Fix small mistake in 2->3 upgrade script.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-22 20:59:52 +02:00
0d28dce326
Print group table contents in debug log.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-22 20:18:15 +02:00
96031214c6
Add support for whitelist regex filter management via CLI.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-22 19:36:11 +02:00
ab3f6dfcc6
Merge pull request #2831 from pi-hole/fix/block-page-adlists
...
Fix block page errors due to gravity DB and changes to queryAds
2019-07-20 14:55:37 -04:00
3ebd43ebf0
Remove outdated adlists.list check and fix empty adlists error message
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-07-19 17:39:00 -07:00
445127accc
Merge pull request #2832 from pi-hole/new/audit_database
...
Migrate audit list to gravity.db database table
2019-07-10 22:55:48 -04:00
420f60b5c7
Add timeout to migration script (1->2).
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-10 12:02:07 +02:00
65fdbc85d5
Add timeout to migration script (2->3).
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-10 12:01:38 +02:00
87f75c737a
Review comments.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-10 12:00:38 +02:00
5ff9052200
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-09 11:41:44 +02:00
b154dd5f07
Quote calls to read FTL config
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-07-08 19:48:50 -07:00
0683842ec3
Fix typo in 2->3 migration script.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-08 21:43:49 +02:00
054c7a2c05
Create new table + view regex_whitelist + rename old regex table to regex_blacklist. This updates the gravity.db version to 3.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-08 21:35:31 +02:00
3d3fc2947e
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-08 19:22:35 +02:00
e8e5d4afda
Get file locations of FTL files from the config
...
Instead of hardcoding the location of certain FTL files (`gravity.db`,
`pihole-FTL.log`), read the configured location from FTL's config. The
default location is used if no custom location has been configured.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-07-07 18:10:39 -07:00
8382f4d727
Rename table to domain_audit and simplify subroutine addAudit().
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-07 21:21:56 +02:00
be3e198f9a
Address linting errors.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-07 10:46:20 +02:00
acc50b709e
Only migrate files once (domain and adlist lists druing initial creation of gravity.db auditlog.list on database upgrade from version 1 to 2.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-07 10:33:08 +02:00
efe8216445
Fix further stickler complaint.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-06 09:45:07 +02:00
0405aaa3da
Review comments and fixing stickler complaints.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-06 09:32:41 +02:00
6bb213e56f
Merge pull request #2826 from Forceflow/development
...
Fix for 404 error when browsing to pi.hole (without /admin)
2019-07-05 17:18:50 -04:00
2fb4256f84
Rename table to "auditlist"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-05 16:28:36 +02:00
82476138c1
Instead of calling sqlite3 multiple times within a loop, we use the ability to add multiple rows within one INSERT clause. This is supported since sqlite3 3.7.11 (2012-03-20) and should be available on all systems.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-05 16:09:13 +02:00
5293beeb77
Update audit script to store domains in new database table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-05 14:10:33 +02:00
0c8f5f1221
Remove comment field from audit table
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-05 14:06:05 +02:00
4f4a12bb40
Upgrade database if necessary and store audit domains therein.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-05 14:03:57 +02:00
1dbe6c83c3
Add database upgrading mechanism for adding the audit table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-05 13:54:18 +02:00
2b5033e732
Add missing spaces found by linter
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-07-04 13:49:39 -07:00
8d9ff550d4
Fix blockpage error if whitelisted, blacklisted, or regex filtered
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-07-04 13:44:14 -07:00
f1733f9c5d
Fetch adlists for the block page from gravity.db
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-07-04 13:11:46 -07:00
92c3c86be4
Merge pull request #2769 from pi-hole/new/arp-flush
...
Add new "pihole arpflush" command
2019-07-04 14:00:16 -04:00
7a1b6fd205
Merge branch 'development' into new/gravity.db_domain_groups
2019-07-03 19:21:55 +02:00
04abcb71f6
Fix potential invalid result for pihole -q
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-07-03 13:04:57 +01:00
1fe3507bc5
Adlists table was renamed to Adlist. Adapt further places in the code to match the new name.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-03 07:56:10 +02:00
9fedafed15
Fix 404 error when browsing to pi.hole (without /admin) (for fedora)
...
Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>
2019-07-03 04:28:44 +02:00
23b3a9a650
Add DISTINCT to the view\'s SELECT queries to avoid domain duplication in case they are enabled in multiple groups at the same time.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-07-01 09:44:20 +02:00
7b2ac25a52
Fix for 404 error when browsing to pi.hole (without /admin)
...
Signed-off-by: Jeroen Baert <3607063+Forceflow@users.noreply.github.com>
2019-07-01 03:42:02 +02:00
f91421418a
Rename adlists -> adlist table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-30 23:21:10 +02:00
3a14e8b013
Check whitelist_by_group.group_id instead of group.enabled against NULL.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-30 23:20:13 +02:00
ad97e95f2f
Add required name column in group table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-30 23:06:15 +02:00
5b01facd73
Fix logix on the views: AND ( OR )
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-30 20:03:22 +02:00
6fe637b9ee
Rename groups -> group
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-30 19:43:18 +02:00
94d83dbb2d
Unify the two group tables into a single "groups" table. This allows managing adlists and domains together.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-30 19:33:02 +02:00
c9a843b417
Merge pull request #2823 from pi-hole/fix/lighttpd-mime
...
Update with v4.3.1 changes
2019-06-30 13:27:55 -04:00
87c115fc86
Change implementation to use linking tables (domain_groups, adlists_groups). This allows adding domains to multiple lists conveniently.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-30 19:04:38 +02:00
b5af125be6
Removed line
...
Signed-off-by: RamSet <RamSet@gmail.com>
2019-06-25 15:45:01 -06:00
ecc49318f0
Fixed MIME related issue present in lighttpd/1.4.53
...
Signed-off-by: RamSet <RamSet@gmail.com>
2019-06-25 15:45:01 -06:00
0774c4e5ca
vw_gravity should actually filter using vw_whitelist.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-16 18:52:23 +02:00
01850c2128
Automatically recreate standard group after deletion to avoid violating foreign key constraints even if foreign key enforcing is disabled (SQLite's default behavior)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-16 17:15:36 +02:00
cbc210b014
Add adlist_groups and mark group_id columns as NOT NULL.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-16 17:05:33 +02:00
c53ee4202b
Add filtering by domain groups to gravity database.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-16 16:50:51 +02:00
6996ffa451
Also flush network_addresses table
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-15 09:15:12 +02:00
4947350ca5
Add arpflush to help and bash autocompletion
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-06-15 09:08:33 +02:00
c1495b0fa8
Merge branch 'development' into new/arp-flush
2019-06-15 09:04:30 +02:00
bcf03647ef
Add comment and remove blankspace
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-12 16:02:59 +01:00
a9d0690f4d
Change the case of some variables
...
Just for consistency
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-10 18:50:52 +01:00
10fbed50f3
Shellcheck
...
Suggesting to use parameter expansion but we need to be able to identify the start of each line
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-10 18:10:25 +01:00
785f1fedd9
Tidy regexp queries
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-10 17:52:58 +01:00
cf21efa103
Minor grammar changes
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-05 14:36:43 +01:00
7613e94ef6
Minor tweaks
...
Mainly for consistency
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-04 06:06:17 +01:00
b49c702f33
Consistency tweak
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-04 00:03:37 +01:00
09532638d5
Read from DB instead of regex.list
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-04 00:00:25 +01:00
97df6d7415
Stickler fix
...
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-03 19:56:10 +01:00
54bfaa28c1
Fix for regexp queries through pihole -q
...
Taking inspiration from: https://github.com/pi-hole/pi-hole/pull/2346
We will use awk to iterate through each regexp and print any that match the domain query.
Signed-off-by: MMotti <matthew.w.motti@gmail.com>
2019-06-03 19:32:59 +01:00
afd28fab03
Merge pull request #2767 from pi-hole/fix/multiple_pihole-FTL_PIDs
...
Improve PID detection in pihole-FTL.service
2019-06-01 01:03:55 -04:00
d92ced6fb6
Merge pull request #2734 from pi-hole/fix/query_black_and_whitelists_database
...
Query black and whitelists database
2019-06-01 00:55:05 -04:00
ae98fde321
Try to obtain PID from PIDFILE. If this fails (file does not exist or is empty), fall back to using pidof + awk
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-31 09:18:12 +02:00
9ddce88092
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-31 08:42:22 +02:00
44f8fcb600
We can print the table name without any extra check as we already returned early in case there are no results.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-31 08:39:18 +02:00
814fdcf9b6
Merge pull request #2768 from pi-hole/fix/dhcp-ignore-names
...
Add dhcp-ignore-names option when enabling DHCP service
2019-05-30 22:35:52 -04:00
5060605626
Print table name before entering the loop for the sake of simplicity
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-30 21:44:59 +02:00
285e6fe090
Address lint complaints
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-30 21:32:35 +02:00
c3023fe681
Add new "pihole arpflush" command to flush both the ARP cache as well as the network table in pihole-FTL.db
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-30 21:25:10 +02:00
c5df104a66
Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-30 16:41:37 +02:00
f6213d4f4d
Use last PID in case pidof returns multiple PIDs for pihole-FTL
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-30 15:26:27 +02:00
bfb99c361c
Note that the gravity size does not include the blacklist entries
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-21 17:12:47 -07:00
5796054305
Increase ID column width to 4
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-20 21:59:18 -07:00
a3e1473ac1
Set explicit column widths to prevent text from getting cut off
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-20 21:33:09 -07:00
7b5fc60e00
Improve table formatting
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-20 21:20:38 -07:00
807ce0af4e
Show whitelist, blacklist, and regexlist details
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-20 21:15:22 -07:00
3f05efd60f
Add extra newline
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-20 21:02:31 -07:00
03d93aa19a
Update debug script with gravity DB changes
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-20 20:58:57 -07:00
7de6bbca61
Merge branch 'development' into release/v4.3
2019-05-18 13:18:14 -07:00
8e1bf6e3d4
Merge branch 'development' into new/gravitydb
...
# Conflicts:
# advanced/Scripts/list.sh
# gravity.sh
# pihole
2019-05-12 15:20:52 -07:00
3220e2b978
Fix for preventing git error message in cron logs
...
Fix to prevent "fatal: No names found, cannot describe anything" git message during scheduled update checks
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-11 10:57:44 +02:00
a904c183df
Use printf to escape domain content. This prevents possible SQL injection issues
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-04 18:25:11 +02:00
5246b3e496
Explicitly escape backslash in ESCAPE clause. This has been suggested by Stickler bot.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-04 13:24:36 +02:00
f80fdd7e83
Improve comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-04 13:19:50 +02:00
6ba58896d2
Simplify code
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-04 13:15:30 +02:00
3aa838bbe4
Implement black- and whitelist searching with SQL statements. We use the ESCAPE clause in the LIKE query as the underscore "_" wildcard matches any single character but we want to suppress this behavior (underscores can be legitimate part of domains)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-04 13:02:14 +02:00
5532df24e4
Pi-hole Debug - tricorder upload function calls
...
Fix tricorder upload function calls to use new curl function.
2019-05-03 02:46:27 -07:00
0bc112ce52
Query only those columns we actually use when showing domains on the CLI. Show date of last modification instead of addition date for domains.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-02 17:11:39 +02:00
d46ff1d2d7
Remove UNIQUE on gravity table as the only column is already PRIMARY KEY. Primary keys must contain UNIQUE values, and cannot contain NULL values
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-01 22:08:30 +02:00
2f698904e4
Use PRIMARY KEY instead of NOT NULL also in gravity and info tables
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-01 18:03:35 +02:00
106f079afc
Improve indentation (single tab) in SQLite template
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-01 17:57:23 +02:00
6c1e3a17f7
Remove NOT NULL constraint on list ids as this is implied by PRIMARY KEY (even though most, if not all, examples on the web still use both attributes at the same time)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-01 17:54:29 +02:00
5e26e8245b
Order results of queries to list views by id key
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-01 17:51:10 +02:00
983117d788
Add id (primary key, autoincrement) field to lists tables
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-01 17:47:15 +02:00
b372f808dd
Fix lint errors
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-01 17:06:14 +02:00
bc9b623638
Modify query.sh to use the gravity database
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-01 16:56:16 +02:00
d5781fb110
Fix extra space in front on END statement in CREATE TRIGGER commands
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-01 16:38:41 +02:00
487718512d
Remove DISTINCT attribute from views. They are not needed as the corresponding data is obtained from fields with UNIQUE attribute so duplications are already prevented at domain insertion. The elimination of the duplication check on imort through the views slightly reduces the load during import (I observed about 8 percent time saved on my NanoPi NEO).
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-01 16:37:23 +02:00
8a92fb24c4
Incorporates changes requested by @Mcat12
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-05-01 11:20:26 +02:00
5c575e73c7
Adds world readable attribute to files created by Pi-hole to circumvent #2724
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-04-30 22:41:12 +02:00
2180531a84
Add trigger for automatic updates of the date_modified column and improve formating in the gravity.db template
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-29 19:43:35 +02:00
6812e8880e
Merge pull request #2705 from pi-hole/fix/chronometer-refresh-arg
...
Fix chronometer refresh incorrectly reading the long argument sleep time
2019-04-29 11:43:07 -04:00
a932209143
Set default for date_modified to be the current time
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-29 17:21:59 +02:00
efeba594ae
Add support for manipulating adlists from the CLI
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-28 21:39:06 +02:00
126f7101ff
Add (optional) date_modified field and use vw_whitelist view in vw_blacklist
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-28 14:44:03 +02:00
b320e74921
Improve argument handling
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-04-27 14:05:04 -07:00
add5e4ca5e
Explicitly allow only -r and --refresh in argument handler
...
It is already checked, but this make the code explicit.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-04-27 13:39:44 -07:00
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
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
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
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
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
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
de44563301
Remove addn-hosts from 01-pihole.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-24 18:51:38 +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
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
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
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
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
63f3381a2b
Warn user if FTL is not on branch master
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-03-02 16:36:49 +01:00
71cd6c137b
Use `curl` instead of `openssl` for transmission of unmodified
...
log file. We want ansi color codes to be sent.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2019-02-23 04:13:44 -08:00
0e14d11a20
Merge branch 'development' into new/gravitydb
2019-02-22 23:06:17 +01:00
a145f1d931
Be more verbose with debug script output
...
If output of `git status -s` is non-null display changes
if output of `git diff` is non-null, display diff
Signed-off-by: Adam Warner <adamw@rner.email>
2019-02-18 22:32:53 +00:00
cd9fadbc44
Remove protocol determination
...
No protocol determination is neede, if you just use double slash.
Signed-off-by: Nils Bergmann <nilsbergmann@noim.io>
2019-02-16 15:32:56 +01:00
5ca1bfc11c
Delete /dev/shm/FTL-* files on (re)start of pihole-FTL
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-08 15:00:35 +01:00
644ec36e64
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-06 18:57:48 +01:00
9984647ebb
After renaming column in regex, it also needs to be renamed in vw_regex
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-05 19:41:11 +01:00
c3c60e10f1
Rename regex field from domain to filter because this described better what it is
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-05 19:07:12 +01:00
8a2363621d
Rename fields from DateAdded to dateadded
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-05 19:06:46 +01:00
dbbf21071b
Invert logic to use ENABLED instead of DISABLED. We make sure to set "enabled = 1 WHERE enabled IS NULL" in gravity_store_in_database()
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-05 19:05:11 +01:00
7a19d24058
Remove user/group from dnsmasq config
...
In the case that FTL is started under root, dnsmasq changes the user to
pihole due to this setting. The shared memory is created before this
switch, and may cause issues such as failing to delete or reallocate
the shared memory.
These config lines were necessary before dnsmasq became part of FTL, but
now since dnsmasq runs under FTL, we can configure the user/group
through FTL.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-02-03 10:55:18 -08:00
93f1859bab
Store regex in gravity.db as well
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-03 15:13:18 +01:00
dcf0a605cf
Use views for all tables and set disabled column to false for those tables that support it
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-03 14:14:14 +01:00
710036adae
Add DISABLED field to white- and blacklist defaulting to false. The two views respect the DISABLED fields for both lists.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-03 13:34:08 +01:00
09c4c88a6d
Create and fill gravity.db during pihole -g
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-03 13:04:31 +01:00
26f2410fe6
Change /var/run/shm to /dev/shm
...
The /var directory may not exist (does not exist on Fedora 29), and is
simply a symlink to /dev/shm.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-02-02 10:37:12 -08:00
5c4ee23795
Fix missed start_service -> restart_service call
...
start_service was changed to restart_service.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-02-02 10:19:44 -08:00
87800a3659
Merge pull request #2570 from pi-hole/tweak/wpad
...
Add wpad vulnerability fix as suggested by dnsmasq.conf.example
2019-01-03 00:10:31 +01:00
a3cee67a61
Merge pull request #2571 from pi-hole/tweak/debug/shm
...
List content of /var/run/shm in debugger
2019-01-02 15:12:54 -05:00
5ffc8c7443
List content of /var/run/shm in debugger
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-01 17:56:02 +01:00
04fd296ffe
Add wpad vulnerability fix as suggested by dnsmasq.conf.example
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-01 17:13:43 +01:00
ed5869646f
Use source instead of dot for setupVars
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-12-27 16:37:10 -05:00
be2d494fcf
Don't show web version in pihole -v output if not installed
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-12-12 14:55:09 -05:00
1cad069050
Add privacy level 4 to all privacy level code
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-12-10 10:18:25 -05:00
916b2920be
Merge pull request #2525 from pi-hole/release/v4.1
...
Release/v4.1 to Development
2018-11-29 08:46:05 -08:00
9f672593bc
Update advanced/Scripts/webpage.sh
...
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
2018-11-26 20:01:41 +01:00
a285ae65fb
Backend changes for DHCPv4 rapid commit support
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-11-25 08:39:58 +01:00
d0125d5aad
Suppress warning if Pi-hole is not used as DHCP server (/etc/pihole/dhcp.leases is not present in this case)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-11-19 17:38:19 +01:00
9d59da8974
Remove dnsmasq checks from debugger
...
This also fixes an issue where the port checks weren't running
(`compare_port_to_service_assigned`).
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-11-08 21:51:21 -05:00
bbb759c684
Merge pull request #2477 from bcambl/debug_init_service_check
...
fix debug service check via sysvinit
2018-11-07 17:50:32 -05:00
f1a7bc9ecd
Merge pull request #2481 from pi-hole/revert-2468-lighttpd-conf-enhancements
...
Revert "lighttpd conf enhancements"
2018-11-07 17:49:25 -05:00
a986f53134
Merge pull request #2436 from pi-hole/fix/password-read-error
...
Fix error when reading in new password
2018-11-01 07:05:27 -07:00
28cbf45d1d
Add explanatory comment for include_shell
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-10-30 21:52:42 -04:00
72829be281
Remove shellcheck overrides
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-10-26 12:14:10 -07:00
d57f9906bd
read -r -a, not read -a -r
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-10-26 19:24:43 +01:00
3d4fea6510
Move -r to before the -p
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-10-26 19:17:49 +01:00
f670644954
Revert "lighttpd conf enhancements"
2018-10-26 19:12:11 +01:00
3ec84553ef
fix debug service check via sysvinit
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-10-24 10:06:11 -06:00
a301d4381f
Merge pull request #2472 from pi-hole/fix-webpwexpansion
...
Prevent BASH from expanding Web Password
2018-10-22 22:18:32 -04:00
49b8ad7e94
Merge pull request #2470 from jeremysherriff/patch-1
...
Silence updateGravity cron job unless errors occur
2018-10-21 14:04:39 -04:00
180d29c7b3
Prevent BASH from expanding Web Password
...
* Resolves issue #2471
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2018-10-21 11:08:22 +11:00
a23ba91681
Merge pull request #2468 from gstrauss/lighttpd-conf-enhancements
...
lighttpd conf enhancements
2018-10-20 16:43:03 -04:00
d3ac8bb6f8
Silence updateGravity job unless errors occur
...
No need for append/logrotate as we are only interested in the latest output
Signed-off-by: jeremysherriff <jeremysherriff@gmail.com>
2018-10-19 19:10:13 +13:00
f87f3b9199
Merge pull request #2467 from pi-hole/fix/dnsmasq-license
...
Update dnsmasq config license
2018-10-17 11:56:41 -04:00
67bdcbcf19
lighttpd: slightly more efficient sample config
...
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2018-10-17 06:54:54 -04:00
69b2a5a876
lighttpd: use file glob for optional external.conf
...
lighttpd 1.4.50 config parse will error if include_shell exits non-zero
and pi-hole sample config: include_shell "cat external.conf 2>/dev/null"
is an error if external.conf does not exist
Replace with: include "external*.conf"
file glob supported since lighttpd 1.4.40 and is not an error if there
is no file which matches the file glob
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2018-10-17 06:54:43 -04:00
7f92671765
Update dnsmasq config license
...
* Also updated "separate config" text
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2018-10-17 11:01:28 +11:00
85dceb12a1
Use curl -s instead of -q
...
See #2416
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-10-12 23:53:21 -04:00
d55012f724
Append versions (after the first) instead of overwriting in updatecheck
...
Fixes an issue brought up in #2435
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-09-30 20:56:44 -04:00
7c6eecc9c8
Ignore shellcheck warning
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-09-30 18:16:08 -04:00
e4cbf5023a
Fix error when reading in new password
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-09-30 18:09:59 -04:00
46356d3027
Merge pull request #2434 from pi-hole/fix/2200
...
Only check web versions if web interface is installed
2018-09-30 17:57:54 -04:00
958a263437
Merge pull request #2431 from pi-hole/fix/use_PHP_comments_in_pihole-FTL.conf_template
...
Improve pihole-FTL.conf template
2018-09-30 17:24:36 -04:00
a89ae82270
Merge pull request #2430 from pi-hole/chrono-lc-all
...
Fix invalid numbers in Chronometer
2018-09-30 17:23:06 -04:00
cedc39bf09
Merge pull request #2426 from mrmajik45/master
...
Read without -r will mangle backslashes. (Fix)
2018-09-30 17:19:56 -04:00
0627e68078
Shellcheck is not a fan of sourcing scripts it does not know about. Add Directive to stop shellcheck from checking this.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-09-30 19:45:04 +01:00
7d78f6314a
Source Setupvars file and only check local/remote Web branch/version if the web interface is installed.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-09-30 19:41:04 +01:00
0f509f4a34
Update piholeDebug.sh
2018-09-28 17:22:31 -04:00
b043000044
Improve template by removing it. PHP cannot digest comments starting in "#" as of v7.0.0
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-09-28 12:08:39 +02:00
c338eab3c6
According to the PHP documentation, PHP 7.0.0+ does not longer recognize hash marks (#) as comments. As FTL has been trained to understand PHP-style (comment lines start with ";") as well, we switch to using them.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-09-28 11:11:30 +02:00
24e1dc92ba
Resolve issue #2428
...
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2018-09-28 10:34:49 +10:00
00f98543ad
read without -r will mangle backslashes.
2018-09-26 10:32:22 -04:00
8684356b44
read without -r will mangle backslashes.
2018-09-26 10:31:44 -04:00
dac27f1f18
Only get the first gateway for chronometer
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-09-09 15:12:48 -04:00
6f276ae4bb
Merge pull request #2299 from nullr0ute/net-tools
...
Use ip route rather than old net-tools route in chronometer.sh
2018-09-09 15:11:19 -04:00
ec29829550
Merge pull request #2388 from Sh4d1/ipv6_brackets
...
Remove external Ipv6 brackets in servername if any
2018-09-01 19:44:29 -04:00
40656641b6
Merge branch 'development' into tweak/reload_on_enable_disable
2018-08-30 22:26:57 +02:00
45bf4b02e7
Ensure that when pihole-FTL is launched as user root, it will drop permissions as soon as this is possible. We tell pihole-FTL to change UID/GID to pihole:pihole instead of the default nobody:nogroup. This default causes conflicts with our SQLite3 database. See that corresponding pull request for further details.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-27 16:51:33 +02:00
85cf98888d
Merge remote-tracking branch 'origin/development' into ipv6_brackets
...
Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>
2018-08-22 09:31:54 +02:00
048e5bb9a2
Remove external ipv6 brackets if any in servername
...
Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>
2018-08-22 09:11:55 +02:00
b9d47d0dd2
Merge pull request #2378 from pi-hole/fix/pihole-FTL-no-caps
...
Start pihole-FTL as root if capabilities are not supported by the system
2018-08-21 14:11:24 +02:00
940c9c3bae
Merge pull request #2383 from pi-hole/feature/privacy-level-4
...
Add support for privacy level 4
2018-08-21 13:03:41 +02:00
f141b9f778
Add support for privacy level 4
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-08-20 17:36:16 -04:00
Adam Warner
DL6ER
DL6ER
XhmikosR
Mograine
chrunchyjesus
John Krull
Dan Schaper
Niklas Elmose Andersen
Jeroen Baert
snapsl
Mark Drobnak
Mcat12
MMotti
RamSet
mpiederiet
pvogt09
Dan Schaper
Adam Warner
Nils Bergmann
Dan Schaper
bcambl
WaLLy3K
jeremysherriff
Glenn Strauss
mrmajik45
Patrik Cyvoct