Commit graph

6030 commits

Author SHA1 Message Date
Clayton Dobbs
3261c2e273
Added check for universe repo on ubuntu bionic with user prompts.
Signed-off-by: Clayton Dobbs <clayton.dobbs@gmail.com>
2018-11-20 21:39:01 -07:00
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>
2018-11-19 17:38:19 +01:00
Dan Schaper
65a3da92f1
Merge pull request #2505 from pi-hole/fix/DNS_with_hash
Account for non-standard ports in DNS server addresses.
2018-11-13 02:53:51 -08: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
bcambl
c3804877ed linting: Double quote to prevent globbing and word splitting.
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-11-11 14:48:16 -06:00
Dan Schaper
35e53ab9c7
Merge pull request #2501 from pi-hole/fix/restart-dns-error-on-success
Fix restartDNS returning code 1 even when it worked
2018-11-10 10:10:49 -08:00
Dan Schaper
053987b9e1
Merge pull request #2500 from pi-hole/fix/debug-remove-dnsmasq
Remove dnsmasq checks from debugger
2018-11-10 10:10:05 -08:00
bcambl
c0bc93c7c4 break dhcpcd and ifcfg network configurations into separate functions
- move some logic from setStaticIPv4 to setDHCPCD
- breakout ifcfg configuration into separate function which takes a config path as an argument
- setStaticIPv4 now checks for configs and calls the appropriate function accordingly
- add logic to check ifcfg file by _connection name_ if file is not found by _interface name_

Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-11-09 15:20:51 -06:00
Dan Schaper
1f596eb2bc
Merge pull request #2502 from pi-hole/release/v4.1
Release/v4.1 backports to development
2018-11-09 12:49:32 -08:00
Mcat12
3f59b51be1
Fix restartDNS returning code 1 even when it worked
If stdout was not a terminal (the `-t 1` check), `restartDNS` would
return code 1 in the success case. This caused the API to fail whenever
it tried to restart the DNS server.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-11-08 22:00:13 -05:00
Mcat12
9d59da8974
Remove dnsmasq checks from debugger
This also fixes an issue where the port checks weren't running
(`compare_port_to_service_assigned`).

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-11-08 21:51:21 -05:00
DL6ER
51218bd1ad
Merge pull request #2497 from pi-hole/fix/adlists.list_not_created
Bugfix for #2354
2018-11-08 20:37:28 +01:00
DL6ER
e1c3c53058
Merge branch 'release/v4.1' into fix/adlists.list_not_created 2018-11-08 20:29:07 +01:00
DL6ER
9fa497b056
Merge pull request #2498 from pi-hole/fix/IPv6_string
Change field from digit to string for printf
2018-11-08 20:28:24 +01:00
Dan Schaper
057fbfc2b9
Change field from digit to string for printf
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-11-08 11:10:09 -08:00
DL6ER
33156071cd
Fix literal "choice" being passed to appendToListsFile()
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-11-08 19:43:35 +01:00
Mark Drobnak
bbb759c684
Merge pull request #2477 from bcambl/debug_init_service_check
fix debug service check via sysvinit
2018-11-07 17:50:32 -05:00
Mark Drobnak
f1a7bc9ecd
Merge pull request #2481 from pi-hole/revert-2468-lighttpd-conf-enhancements
Revert "lighttpd conf enhancements"
2018-11-07 17:49:25 -05:00
Mark Drobnak
d514608f91
Merge pull request #2492 from pi-hole/fix/IPv4_detection
IPv4 detection improvements.
2018-11-07 17:48:34 -05:00
Dan Schaper
e8c2e26358
Override shellcheck with explanations.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-11-03 13:39:43 -07:00
Dan Schaper
61c67849d7
Support multiple distributions and release versions in find_IPv4_information().
Add basic sanity check to function, remove unused variable.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-11-03 13:20:40 -07:00
Mark Drobnak
2cdbb34763
Merge pull request #2488 from pi-hole/feature/command_function
Moved `command -v` calls to function in installer.
2018-11-02 22:16:44 -04:00
Dan Schaper
538ba918c1
Merge pull request #2490 from sadsfae/add_blog_guide_hobohouse
Add hobohouse blog/guide to coverage links.
2018-11-02 13:00:24 -07:00
Will Foster
c330df9700 Add hobohouse blog/guide to coverage links.
This is a link to an updated guide on setting up
Pi-hole on Raspberry Pi.  It also covers using the Tomato
router firmware and running things in a docker container
along with some tips, blocklist recommendations and usage.

Signed-off-by: Will Foster <sadsfae@funcamp.net>
2018-11-02 19:50:39 +00:00
Mark Drobnak
1789a2db29
Merge pull request #2384 from pi-hole/feature/install-privacy-level
Set FTL Privacy Level During Install
2018-11-01 15:16:11 -04:00
Dan Schaper
c270b83341
Use printf instead of echo
Co-Authored-By: Mcat12 <mark.drobnak@gmail.com>
2018-11-01 15:14:26 -04:00
Dan Schaper
02f0788033
Moved command -v calls to function.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-11-01 12:00:08 -07:00
Dan Schaper
a2ea6e8d47
Merge pull request #2486 from pi-hole/feature/install_printf
Beginning steps to installer overhaul. Echos to Printf test.
2018-11-01 10:16:57 -07:00
Dan Schaper
a986f53134
Merge pull request #2436 from pi-hole/fix/password-read-error
Fix error when reading in new password
2018-11-01 07:05:27 -07:00
Dan Schaper
9d2d45b473
Query php directly for major and minor version id strings.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-11-01 05:59:14 -07:00
Dan Schaper
0c892e6b3a
Addressed Stickler ShellCheck lints
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-10-31 14:35:55 -07:00
Dan Schaper
a0fc38d6a2
All terminal echo commands changed to printf.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-10-31 11:14:05 -07:00
Mcat12
28cbf45d1d
Add explanatory comment for include_shell
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-10-30 21:52:42 -04:00
Dan Schaper
72829be281
Remove shellcheck overrides
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-10-26 12:14:10 -07:00
Adam Warner
d57f9906bd
read -r -a, not read -a -r
Signed-off-by: Adam Warner <adamw@rner.email>
2018-10-26 19:24:43 +01:00
Adam Warner
3d4fea6510
Move -r to before the -p
Signed-off-by: Adam Warner <adamw@rner.email>
2018-10-26 19:17:49 +01:00
Adam Warner
f670644954
Revert "lighttpd conf enhancements" 2018-10-26 19:12:11 +01:00
Mark Drobnak
dd6821814a
Merge pull request #2479 from pi-hole/fix/referral-readme
update broken link, add coverage, and fix formatting
2018-10-25 17:09:30 -04:00
Jacob Salmela
f33584511c
update broken link, add coverage, and fix formatting
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-10-25 05:58:17 -05:00
bcambl
3ec84553ef fix debug service check via sysvinit
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-10-24 10:06:11 -06:00
Mark Drobnak
a301d4381f
Merge pull request #2472 from pi-hole/fix-webpwexpansion
Prevent BASH from expanding Web Password
2018-10-22 22:18:32 -04:00
Mark Drobnak
49b8ad7e94
Merge pull request #2470 from jeremysherriff/patch-1
Silence updateGravity cron job unless errors occur
2018-10-21 14:04:39 -04:00
WaLLy3K
180d29c7b3
Prevent BASH from expanding Web Password
* Resolves issue #2471

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2018-10-21 11:08:22 +11:00
Mark Drobnak
a23ba91681
Merge pull request #2468 from gstrauss/lighttpd-conf-enhancements
lighttpd conf enhancements
2018-10-20 16:43:03 -04:00
jeremysherriff
d986da63a5 Pass gravity exit code back to caller to allow for cron error handling
Signed-off-by: jeremysherriff <jeremysherriff@gmail.com>
2018-10-19 19:10:37 +13:00
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>
2018-10-19 19:10:13 +13:00
Mark Drobnak
f87f3b9199
Merge pull request #2467 from pi-hole/fix/dnsmasq-license
Update dnsmasq config license
2018-10-17 11:56:41 -04:00
Glenn Strauss
67bdcbcf19 lighttpd: slightly more efficient sample config
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2018-10-17 06:54:54 -04:00
Glenn Strauss
69b2a5a876 lighttpd: use file glob for optional external.conf
lighttpd 1.4.50 config parse will error if include_shell exits non-zero
and pi-hole sample config: include_shell "cat external.conf 2>/dev/null"
is an error if external.conf does not exist

Replace with: include "external*.conf"
file glob supported since lighttpd 1.4.40 and is not an error if there
is no file which matches the file glob

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2018-10-17 06:54:43 -04:00