DL6ER
|
3a14e8b013
|
Check whitelist_by_group.group_id instead of group.enabled against NULL.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
5 years ago |
DL6ER
|
ad97e95f2f
|
Add required name column in group table.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
5 years ago |
DL6ER
|
5b01facd73
|
Fix logix on the views: AND ( OR )
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
5 years ago |
DL6ER
|
6fe637b9ee
|
Rename groups -> group
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
5 years ago |
DL6ER
|
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>
|
5 years ago |
DL6ER
|
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>
|
5 years ago |
DL6ER
|
0774c4e5ca
|
vw_gravity should actually filter using vw_whitelist.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
5 years ago |
DL6ER
|
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>
|
5 years ago |
DL6ER
|
cbc210b014
|
Add adlist_groups and mark group_id columns as NOT NULL.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
5 years ago |
DL6ER
|
c53ee4202b
|
Add filtering by domain groups to gravity database.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
5 years ago |
DL6ER
|
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>
|
5 years ago |
DL6ER
|
f6213d4f4d
|
Use last PID in case pidof returns multiple PIDs for pihole-FTL
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
5 years ago |
DL6ER
|
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>
|
6 years ago |
DL6ER
|
2f698904e4
|
Use PRIMARY KEY instead of NOT NULL also in gravity and info tables
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
106f079afc
|
Improve indentation (single tab) in SQLite template
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
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>
|
6 years ago |
DL6ER
|
5e26e8245b
|
Order results of queries to list views by id key
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
983117d788
|
Add id (primary key, autoincrement) field to lists tables
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
d5781fb110
|
Fix extra space in front on END statement in CREATE TRIGGER commands
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
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>
|
6 years ago |
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>
|
6 years ago |
DL6ER
|
a932209143
|
Set default for date_modified to be the current time
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
126f7101ff
|
Add (optional) date_modified field and use vw_whitelist view in vw_blacklist
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
bd0215524b
|
Add vw_adlists view which returns only enabled adlists
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
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>
|
6 years ago |
DL6ER
|
61cfd2f9f9
|
Add adlists table
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
0e14d11a20
|
Merge branch 'development' into new/gravitydb
|
6 years ago |
DL6ER
|
5ca1bfc11c
|
Delete /dev/shm/FTL-* files on (re)start of pihole-FTL
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
644ec36e64
|
Review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
9984647ebb
|
After renaming column in regex, it also needs to be renamed in vw_regex
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
c3c60e10f1
|
Rename regex field from domain to filter because this described better what it is
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
8a2363621d
|
Rename fields from DateAdded to dateadded
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
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>
|
6 years ago |
DL6ER
|
93f1859bab
|
Store regex in gravity.db as well
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
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>
|
6 years ago |
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>
|
6 years ago |
DL6ER
|
09c4c88a6d
|
Create and fill gravity.db during pihole -g
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
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>
|
6 years ago |
jeremysherriff
|
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>
|
6 years ago |
DL6ER
|
b043000044
|
Improve template by removing it. PHP cannot digest comments starting in "#" as of v7.0.0
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
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>
|
6 years ago |
DL6ER
|
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
|
6 years ago |
DL6ER
|
ec2426b24d
|
Add clarifying comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
5cd3b11391
|
Start pihole-FTL as root if capabilities are not supported by the system
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
d30b565d98
|
Touch dhcp.leases to ensure it exists. There are some systems out there where the installer didn't finish on the first run and some users don't have this file being created. Although /etc/pihole should be owned by pihole:pihole, pihole-FTL sometimes fails to open this file and - if this is the case and DHCP is enabled - refuses to start altogether.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
Dan Schaper
|
af2ec61965
|
Convert [] to ()
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
6 years ago |
Dan Schaper
|
94b7c8eb59
|
Added header for file. Not using standard Pi-hole copyright header.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
6 years ago |
Dan Schaper
|
f2c675cff6
|
Formatted pihole-FTL.conf for readability.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
6 years ago |
Dan Schaper
|
b79ff05e29
|
Move template files to own subdir. Include pihole-FTL.conf in templates.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
6 years ago |