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
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
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
2292720fed
Merge pull request #2650 from mmphego/patch-1
...
Update README.md
2019-03-01 13:19:31 -05:00
b77efa521f
Update README.md
...
Removed the extra double quote.
Signed-off-by: Mpho Mphego <mpho112@gmail.com >
2019-03-01 09:38:36 +02:00
cfe221706b
Update README.md
...
Changed badges from HTML code to markdown for consistency
Signed-off-by: Mpho Mphego <mpho112@gmail.com >
2019-02-27 09:57:23 +02:00
293e2a8e80
Merge pull request #2647 from pi-hole/feature/curl_debug
...
Use `curl` instead of `openssl` for debug upload.
2019-02-23 09:11:02 -08: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
bbc392caeb
More review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-22 22:49:02 +01:00
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
9867b7fccf
Don't fail when trying to detect OS architecture on RPM-based systems
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-22 18:41:01 +01:00
58f198626a
Merge pull request #2640 from pi-hole/new/DebugAdditions
...
Add git status/diff to debug log
2019-02-18 19:28:21 -05: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
9748f19172
Merge pull request #2639 from pi-hole/hotfix/v4.2.2
...
Update development from hotfix/v4.2.2
2019-02-18 13:54:08 -05:00
ba1e94d3d9
Merge pull request #2626 from pi-hole/hotfix/v4.2.2
...
Pi-hole Core v4.2.2
2019-02-18 18:36:13 +01: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
062a180a1c
Merge pull request #2621 from cryptomilk/development-fix
...
A bunch of fixes for basic-install.sh
2019-02-10 20:06:26 -05:00
860ec1a7c4
basic_install: Use install for sudoers
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2019-02-10 08:45:03 +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
2f189cd076
basic_install: There is no pihole group, remove it
...
Only a user has been created beforehand. Only some distributions create
a group with the same name based on their configuration. We cannot
assume this is always the default.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2019-02-08 08:06:12 +01:00
2f0e6a6dda
basic_install: Make sure the PI_HOLE_CONFIG_DIR exists
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2019-02-08 08:06:12 +01:00
f187b42a98
basic_install: Define webroot globally as a variable
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2019-02-08 08:06:02 +01:00
f9250d91a5
Explictly escape the escape.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-06 19:17:13 +01:00
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
644ec36e64
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-06 18:57:48 +01:00
838e1b19ec
basic_install: Set permissons for PI_HOLE_DASHBOARD_DIR
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2019-02-06 10:41:37 +01:00
d5bbb2b640
basic_install: Use a varibale for the pihole dashboard dir
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2019-02-06 10:40:47 +01:00
dc91d4b1f9
basic_install: If a static interface is already set up we are done
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2019-02-06 07:50:21 +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
