Mcat12
|
8e1bf6e3d4
|
Merge branch 'development' into new/gravitydb
# Conflicts:
# advanced/Scripts/list.sh
# gravity.sh
# pihole
|
2019-05-12 15:20:52 -07:00 |
|
pvogt09
|
3f90261520
|
Moves chmod after every creation of ${destination} instead of end of function
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
|
2019-05-12 11:25:48 +02:00 |
|
pvogt09
|
225285cb97
|
Removes chmod for ${source} and superfluous chmod for ${destination}
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
|
2019-05-11 11:14:07 +02:00 |
|
pvogt09
|
a3d2a1062f
|
Makes blocklists world readable
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
|
2019-05-10 11:13:19 +02:00 |
|
DL6ER
|
0cfecd31d3
|
Invert logic to reduce nesting
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-05-01 22:07:14 +02:00 |
|
DL6ER
|
008e88b84b
|
Only migrate legacy list files when we create gravity.db in the same gravity run
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-05-01 18:04:31 +02:00 |
|
DL6ER
|
540c57f755
|
Add comment for automigrated list entries
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-05-01 17:51:25 +02:00 |
|
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 |
|
pvogt09
|
8a92fb24c4
|
Incorporates changes requested by @Mcat12
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
|
2019-05-01 11:20:26 +02:00 |
|
pvogt09
|
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 |
|
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
|
4946b5907b
|
Move migrated files to backup directory instead of deleting them. This has the benefit that gravity.db can be recreated at any time by: 1. deleting gravity.db, 2. copying all files from the migration_backup directory back to /etc/pihole, 3. running pihole -g again.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-04-28 22:15:47 +02:00 |
|
Mark Drobnak
|
4596d9a577
|
Merge branch 'development' into new/gravitydb
|
2019-04-26 23:40:28 -04:00 |
|
DL6ER
|
8524aecfed
|
Don't set gravity database permissions
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-04-26 17:56:11 +02:00 |
|
DL6ER
|
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 |
|
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
|
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 |
|
DL6ER
|
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 |
|
DL6ER
|
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 |
|
DL6ER
|
465a39427b
|
Source adlists from gravity database
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-04-25 10:46:18 +02:00 |
|
DL6ER
|
2664ac0efc
|
Improve error reporting
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-04-25 10:18:37 +02:00 |
|
DL6ER
|
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 |
|
DL6ER
|
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 |
|
DL6ER
|
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 |
|
Dan Schaper
|
54ae9d83b0
|
Stickler-lints
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2019-02-23 13:42:15 -08:00 |
|
DL6ER
|
bbc392caeb
|
More review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-02-22 22:49:02 +01:00 |
|
DL6ER
|
61840edb30
|
Fill comment field with NULL (default) instead of empty string and use a variable for the timestamp instead of periodically calling date
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-02-22 22:46:19 +01:00 |
|
DL6ER
|
f9250d91a5
|
Explictly escape the escape.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-02-06 19:17:13 +01:00 |
|
DL6ER
|
491c828661
|
Improved code, ensure that gravity.sh passes shellcheck as a whole
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-02-06 19:09:09 +01:00 |
|
DL6ER
|
644ec36e64
|
Review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-02-06 18:57:48 +01:00 |
|
DL6ER
|
ec5b16ef85
|
Fix incomplete comment
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-02-05 19:08:08 +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 |
|
DL6ER
|
b2f4385232
|
Avoid infinity loop if gravity optimization fails
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-02-03 17:05:00 +01:00 |
|
DL6ER
|
1f9a7d0b0c
|
Only run VACUUM on "pihole -g -o"
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-02-03 17:01:38 +01:00 |
|
DL6ER
|
d5feffa117
|
Do not backup the database
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-02-03 16:45:19 +01:00 |
|
DL6ER
|
fc62cf7e2f
|
Only run VACUUM on "full" gravity runs
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-02-03 16:45:06 +01: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
|
8a91fe6992
|
Store domains in gravit tables: gravity, whitelist, blacklist
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2019-02-03 13:21:26 +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 |
|
xch12i5
|
cd8a423b32
|
Solves RegEx issue and updates documentation.
Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>
|
2019-01-20 16:09:25 +01:00 |
|
xch12i5
|
e02da90faa
|
Replaces double quotes by single quotes and updates documentation.
Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>
|
2019-01-19 17:52:28 +01:00 |
|
xch12i5
|
0de5132e2b
|
Solves RegEx issue.
Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>
|
2019-01-19 17:07:27 +01:00 |
|
DL6ER
|
05bd88b4d8
|
Update agent string: the selected string is the most abundant one on 06 Dec 2018 with a percentage of almost 10%
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-12-06 18:04:17 +01:00 |
|
Adam Warner
|
83f7bd66e6
|
Don't mv preEventHorizon, copy it.
Signed-off-by: Adam Warner <adamw@rner.email>
|
2018-12-05 22:29:01 +00:00 |
|
Dan Schaper
|
5c621fa253
|
Lints
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-11-12 17:21:34 -08:00 |
|
Dan Schaper
|
f9e71bee0a
|
Account for port, or lack of, in PIHOLE_DNS_1
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-11-12 17:15:24 -08:00 |
|
Mark Drobnak
|
33939a30ea
|
Merge pull request #2347 from Gusher123/patch-1
Don't let one blocklist block an other blocklist
|
2018-09-30 21:24:45 -04:00 |
|
Adam Warner
|
0131055ec9
|
Submission stale, addressing @mcat12's comments
Signed-off-by: Adam Warner <adamw@rner.email>
|
2018-09-30 20:00:06 +01:00 |
|