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
9248c92b5c
Merge pull request #2984 from diginc/development
...
Adding docker+arm detection & FTL download
2019-11-27 21:25:41 +00:00
583ea4d17a
Merge branch 'development' into development
2019-11-27 21:17:05 +00:00
edcdf9f619
Merge pull request #3003 from pi-hole/fix/tbd
...
FTL always determined.
2019-11-27 09:46:17 +00:00
1fb70c977c
Merge pull request #3002 from pi-hole/tweak/output-format
...
add a double space to the beginning of some outputs
2019-11-25 19:41:58 +00: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
4840bdb031
add a double space to the beginning of some outputs
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-14 19:06:23 +00:00
a85e7a2a43
Merge pull request #2999 from pi-hole:fix/api_utf8_encoding
...
Add php-xml package as new dependency
2019-11-13 19:03:53 +00: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
61d233f069
Merge pull request #2964 from bcambl/selinux_enforcing
...
Exit installation when SELinux in unsupported state
2019-11-12 21:48:15 +01:00
d457d40e0b
Add php-xml package as new dependency.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-12 20:49:46 +01:00
476975540a
make some shebangs comply to posix standard
2019-11-05 22:33:00 +01:00
3fbb0ac8dd
Adding docker+arm detection & FTL download
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-10-29 22:26:46 -05:00
29bad2fe9b
Merge pull request #2963 from bcambl/fedora_pkg_check_stdout
...
Fix dependency check stdout on Fedora/CentOS
2019-10-16 19:57:23 +01:00
f4aca3f21d
Merge pull request #2966 from Asuza/minor-typo
...
Minor typo
2019-10-16 19:34:56 +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
612d408034
replace echo with printf in install_dependent_packages()
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-10-14 20:16:40 -06:00
a86f578139
replace echo with printf in checkSelinux()
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-10-14 20:06:23 -06: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
cf2b021502
linting: E302 expected 2 blank lines, found 1
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-10-14 13:29:43 -06:00
cd9b1fcb8c
update tests for SELinux changes
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-10-14 13:02:44 -06:00
81ca78e7f4
exit installer if SELinux is enforcing
...
The Pi-hole project does not ship a custom SELinux policy as the required policy would lower the overall system security.
Users who require SELinux to be enforcing are encouraged to create an custom policy on a case-by-case basis.
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-10-14 12:25:24 -06:00
fc0899b2ad
fix fedora dependency check/install stdout
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-10-13 14:35:38 -06:00
2e138eb99f
Merge pull request #2954 from pi-hole/reetP-Patch
...
Update pihole
2019-10-06 19:10:05 +01:00
4f21f67775
Update pihole
...
Fix spelling typos
2019-10-06 15:09:14 +01:00
3269c63f89
Merge pull request #2948 from pi-hole/fix/restart_lighttpd
...
Do not create empty regex.list file
2019-09-29 12:27:25 -04:00
149fb0c216
Do not install a blank regex file.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-29 18:03:37 +02:00
d244a018d0
Merge pull request #2944 from pi-hole/fix/vw_gravity_creation_v1
...
Fix gravity database table creation order
2019-09-26 14:27:05 +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
ae3b8be4d4
Merge pull request #2938 from pi-hole/release/v4.3.2
...
Release v4.3.2 merge to development for update.
2019-09-21 20:40:38 -04: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
a71f35d263
Merge pull request #2932 from pi-hole/fix/no-backup-no-error
...
Fix cross where there is no error
2019-09-17 23:51:46 +02:00
9a6deb5a1a
Fix tests
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-09-17 21:16:49 +01:00
f582344b9a
"No default index.lighttpd.html file found... not backing up" is not an error.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-17 21:59:48 +02:00
847c4f26aa
Merge pull request #2916 from pi-hole/fix/disable-firefox-doh
...
Improve #2915
2019-09-07 17:58:02 -04: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
b4131ae817
Merge pull request #2915 from pi-hole/new/disable-firefox-doh
...
Prevent Firefox from automatically switching over to DNS-over-HTTPS
2019-09-07 12:24:01 +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
b209629579
Merge pull request #2909 from pi-hole/fix/domains_in_comment
...
Print messages only after removing possible matches in comments
2019-09-05 21:30:34 -07:00
93ecc046ea
Merge pull request #2912 from pi-hole/tweak/RemoveAdblockSupport
...
Remove adblock list style support
2019-09-03 20:51:09 -04:00
Adam Warner
DL6ER
DL6ER
chrunchyjesus
Adam Hill
John Krull
bcambl
John Crisp
Mark Drobnak
Dan Schaper