Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-24 13:50:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
3797 commits 11 branches 109 tags 28 MiB
Commit graph

1182 commits

Author SHA1 Message Date
DL6ER
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
DL6ER
b372f808dd
Fix lint errors 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-01 17:06:14 +02:00
DL6ER
bc9b623638
Modify query.sh to use the gravity database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-01 16:56:16 +02:00
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
efeba594ae
Add support for manipulating adlists from the CLI 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-28 21:39:06 +02:00
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
08ee9526ad
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-26 17:06:01 +02:00
DL6ER
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
DL6ER
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
DL6ER
43bced7997
Add more comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-25 12:45:08 +02:00
DL6ER
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
DL6ER
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
DL6ER
61cfd2f9f9
Add adlists table 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-24 19:48:06 +02:00
DL6ER
ee4dabeca6
Merge branch 'development' into new/gravitydb 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-24 19:12:19 +02:00
DL6ER
de44563301
Remove addn-hosts from 01-pihole.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-24 18:51:38 +02:00
Adam Warner
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
Mark Drobnak
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
DL6ER
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
DL6ER
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
Dan Schaper
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
DL6ER
0e14d11a20
Merge branch 'development' into new/gravitydb 2019-02-22 23:06:17 +01:00
Adam Warner
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
Nils Bergmann
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
DL6ER
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
DL6ER
644ec36e64
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-06 18:57:48 +01:00
DL6ER
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
DL6ER
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
DL6ER
8a2363621d
Rename fields from DateAdded to dateadded 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-05 19:06:46 +01:00
DL6ER
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
Mcat12
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
DL6ER
93f1859bab
Store regex in gravity.db as well 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-03 15:13:18 +01:00
DL6ER
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
DL6ER
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
DL6ER
09c4c88a6d
Create and fill gravity.db during pihole -g 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-03 13:04:31 +01:00
Mcat12
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
Mcat12
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
DL6ER
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
Mark Drobnak
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
DL6ER
5ffc8c7443
List content of /var/run/shm in debugger 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-01 17:56:02 +01:00
DL6ER
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