Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
3715 commits 8 branches 109 tags 27 MiB
Commit graph

1142 commits

Author SHA1 Message Date
Dan Schaper
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
Adam Warner
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
DL6ER
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
Mcat12
7a19d24058
Remove user/group from dnsmasq config 
In the case that FTL is started under root, dnsmasq changes the user to
pihole due to this setting. The shared memory is created before this
switch, and may cause issues such as failing to delete or reallocate
the shared memory.

These config lines were necessary before dnsmasq became part of FTL, but
now since dnsmasq runs under FTL, we can configure the user/group
through FTL.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-02-03 10:55:18 -08:00
Mcat12
26f2410fe6
Change /var/run/shm to /dev/shm 
The /var directory may not exist (does not exist on Fedora 29), and is
simply a symlink to /dev/shm.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-02-02 10:37:12 -08:00
Mcat12
5c4ee23795
Fix missed start_service -> restart_service call 
start_service was changed to restart_service.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-02-02 10:19:44 -08:00
DL6ER
87800a3659
Merge pull request #2570 from pi-hole/tweak/wpad 
Add wpad vulnerability fix as suggested by dnsmasq.conf.example
 2019-01-03 00:10:31 +01:00
Mark Drobnak
a3cee67a61
Merge pull request #2571 from pi-hole/tweak/debug/shm 
List content of /var/run/shm in debugger
 2019-01-02 15:12:54 -05:00
DL6ER
5ffc8c7443
List content of /var/run/shm in debugger 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-01 17:56:02 +01:00
DL6ER
04fd296ffe
Add wpad vulnerability fix as suggested by dnsmasq.conf.example 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-01 17:13:43 +01:00
Mark Drobnak
ed5869646f
Use source instead of dot for setupVars 
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2018-12-27 16:37:10 -05:00
Mcat12
be2d494fcf
Don't show web version in pihole -v output if not installed 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-12-12 14:55:09 -05:00
Mcat12
1cad069050
Add privacy level 4 to all privacy level code 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-12-10 10:18:25 -05:00
Dan Schaper
916b2920be
Merge pull request #2525 from pi-hole/release/v4.1 
Release/v4.1 to Development
 2018-11-29 08:46:05 -08:00
Dan Schaper
9f672593bc
Update advanced/Scripts/webpage.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2018-11-26 20:01:41 +01:00
DL6ER
a285ae65fb
Backend changes for DHCPv4 rapid commit support 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-11-25 08:39:58 +01: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
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
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
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
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
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
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
WaLLy3K
7f92671765
Update dnsmasq config license 
* Also updated "separate config" text

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2018-10-17 11:01:28 +11:00
Mark Drobnak
85dceb12a1
Use curl -s instead of -q 
See #2416 

Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2018-10-12 23:53:21 -04:00
Mcat12
d55012f724
Append versions (after the first) instead of overwriting in updatecheck 
Fixes an issue brought up in #2435

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-09-30 20:56:44 -04:00
Mcat12
7c6eecc9c8
Ignore shellcheck warning 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-09-30 18:16:08 -04:00
Mcat12
e4cbf5023a
Fix error when reading in new password 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-09-30 18:09:59 -04:00
Mark Drobnak
46356d3027
Merge pull request #2434 from pi-hole/fix/2200 
Only check web versions if web interface is installed
 2018-09-30 17:57:54 -04:00
Mark Drobnak
958a263437
Merge pull request #2431 from pi-hole/fix/use_PHP_comments_in_pihole-FTL.conf_template 
Improve pihole-FTL.conf template
 2018-09-30 17:24:36 -04:00
Mark Drobnak
a89ae82270
Merge pull request #2430 from pi-hole/chrono-lc-all 
Fix invalid numbers in Chronometer
 2018-09-30 17:23:06 -04:00
Mark Drobnak
cedc39bf09
Merge pull request #2426 from mrmajik45/master 
Read without -r will mangle backslashes. (Fix)
 2018-09-30 17:19:56 -04:00
Adam Warner
0627e68078
Shellcheck is not a fan of sourcing scripts it does not know about. Add Directive to stop shellcheck from checking this. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-09-30 19:45:04 +01:00
Adam Warner
7d78f6314a
Source Setupvars file and only check local/remote Web branch/version if the web interface is installed. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-09-30 19:41:04 +01:00
mrmajik45
0f509f4a34
Update piholeDebug.sh 2018-09-28 17:22:31 -04:00
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>
 2018-09-28 12:08:39 +02:00
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>
 2018-09-28 11:11:30 +02:00
WaLLy3K
24e1dc92ba
Resolve issue #2428 
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2018-09-28 10:34:49 +10:00