1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-23 15:28:07 +00:00
Commit Graph

920 Commits

Author SHA1 Message Date
DL6ER
cca8412921
Use "echo -n" to avoid haveing newlines in the files
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-23 11:52:27 +01:00
DL6ER
d15a5ad5c1
Add required documentation in the source code
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-23 00:46:51 +01:00
DL6ER
8ed75dd176
Add extra entry to the end of the saved branches and versions such that PHP's explode() subroutine can correctly disentangle the first three entries and does not get confused by the newline character at the end of the FTL version/branch...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-23 00:42:41 +01:00
Dan Schaper
8ca0582afc
Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor 2017-12-21 10:56:37 -08:00
DL6ER
be0c457445
Sleep 30 seconds after reboot to be sure that the system is ready
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-21 12:42:28 +01:00
DL6ER
3c04dbb4ed
Update remote version at 17:59 as well as on reboot
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-21 12:33:08 +01:00
DL6ER
cfca367eef Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-")
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-18 21:45:24 -05:00
DL6ER
8a243c5872 Insert also old trust anchor
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-18 21:45:15 -05:00
DL6ER
b30b3f3aeb Update DNSSEC trust anchor
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-18 21:44:34 -05:00
Mark Drobnak
e3fa06d7ff
Merge pull request #1829 from keithbentrup/development
Must send HTTP headers before html
2017-12-13 13:37:32 -05:00
Dan Schaper
423280cee1
Merge pull request #1817 from jjssoftware/development
pihole.log permissions
2017-12-09 14:15:12 -08:00
Keith Bentrup
45ab2a3d7a send HTTP headers before HTML
Signed-off-by: Keith Bentrup <keith@keithbentrup.com>
2017-12-09 17:03:20 -05:00
DL6ER
05d015169c
Check for local version and branches every 10 minutes, check for remote versions only once a day
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-09 19:00:46 +01:00
Jacob Salmela
28bed0041e
remove comment
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-12-08 18:29:28 -06:00
Jacob Salmela
6f03e30151
fixes #1537 by checking if systemctl is found
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-12-08 18:23:55 -06:00
Joe
6ecd93d0c9
pihole.log permissions
This change makes pihole more friendly to the non-existence of the pihole.log file. This can help with systems that are configured to mount /var/log as a tmpfs volume. It may also help with systems where the pihole.log file is accidentally/unintentionally removed. 

Further discussion around the details of this change are in https://github.com/pi-hole/pi-hole/issues/1798
2017-12-08 22:25:01 +00:00
Adam Warner
a9a40ca46c
Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead.
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 23:27:40 +00:00
Adam Warner
162a7b56fe
force mode is no longer referenced. Regression. Same with domToRemoveList
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:42:08 +00:00
WaLLy3K
2dc1851892
Allow passwords with spaces
e.g: `pihole -a -p "foo bar"`

 Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-11-23 13:17:34 +11:00
Jacob Salmela
9631519eb1
Merge pull request #1752 from pi-hole/new/bashupdatechecker
Add bash / cron based update checker for Pi-hole
2017-11-08 20:38:40 -06:00
DL6ER
90efa3b610
Simplify git subroutines
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-08 19:11:41 +01:00
Adam Warner
5221767a70
Merge pull request #1735 from bcambl/debug_selinux
add SELinux checks to debug script
2017-10-30 13:07:36 +00:00
DL6ER
9492ff26c6
Merge pull request #1747 from pi-hole/tweak/gravity_update_time
Randomize gravity update time
2017-10-29 16:34:18 +01:00
DL6ER
0db76aada0
Silence errors when directory to be checked does not exist (system may have been installed without a web interface!)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-28 15:44:17 +02:00
DL6ER
9be854031f
Don't store FTL branch until the next release of FTL which supports returning the branch in an easy way
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-28 13:41:24 +02:00
DL6ER
709851503f
Use "pihole-FTL branch" to get FTL's branch
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-28 13:27:12 +02:00
DL6ER
6ca47dc3b3
Add bash / cron based update checker for Pi-hole 2017-10-28 13:20:02 +02:00
WaLLy3K
2390b80359 Silence non-numeric domains_being_blocked output
* Round $cpu_mhz to 1 decimal place
* Remove ".0" from $cpu_freq
* Silence non-numeric domains_being_blocked output
* Use "Core" and "Web" as appropriate

Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-25 21:04:43 +11:00
DL6ER
85d159bdd1
Randomize gravity update time
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 15:52:53 +02:00
bcambl
0f868f7649 remove un-used DONE variable
(still available via sourced COL_TABLE on line 29)
2017-10-19 22:57:07 -06:00
bcambl
31730e7197 add missing colors to COL_TABLE fallback 2017-10-13 09:14:19 -06:00
bcambl
7d76db00ac update 'SELinux not detected' message 2017-10-13 08:58:35 -06:00
bcambl
8aceb8bf53 replace deprecated colors in debug script
- COL_LIGHT_GREEN  -> COL_GREEN
 - COL_LIGHT_RED    -> COL_RED
 - COL_LIGHT_PURPLE -> COL_PURPLE
2017-10-12 23:33:28 -06:00
bcambl
a17d1be7a4 simplify selinux debug variables 2017-10-12 23:24:02 -06:00
bcambl
1e6cc63abe add SELinux checking to debug script 2017-10-12 20:55:14 -06:00
WaLLy3K
3e727c5e5d Merge pull request #1721 from pi-hole/fix/lightyconf
Add comment for include_shell feature
2017-10-11 01:55:05 +00:00
DL6ER
e0edac32c7 Merge pull request #1728 from pi-hole/new/nuke_lists
Add nuclear option to list.sh
2017-10-10 19:12:16 +02:00
WaLLy3K
e4b3bc4209 Minor spacing corrections
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-10 13:17:33 +11:00
WaLLy3K
51b09efceb Fix minor typo
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-09 19:53:45 +11:00
WaLLy3K
2dabacd024 Fix minor typo
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-09 19:53:22 +11:00
WaLLy3K
0613dcc87b Merge pull request #1692 from andofrjando/cors_mixed_content_fix
Fix for bug on block page (#1416) caused by CORS mixed content when behind reverse proxy using SSL
2017-10-09 07:53:33 +00:00
WaLLy3K
d59a2a4cfc Merge pull request #1729 from pi-hole/fix/email-help-argument
Allow emails which include `-h` in them (Fix for #1691)
2017-10-08 12:23:46 +11:00
WaLLy3K
2c091f3a3c Merge branch 'development' into cors_mixed_content_fix 2017-10-08 12:22:14 +11:00
WaLLy3K
cfcdc53185 Merge pull request #1722 from pi-hole/fix/bpfqdn
Improve FQDN Authorized Hosts functionality (Fix for #1416)
2017-10-08 12:19:11 +11:00
WaLLy3K
bd33018660 Shellcheck OR validation
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-08 12:16:05 +11:00
Mcat12
67a5594909 Allow emails which include -h in them
For example, mcat12@pi-hole.net would previously spit out the help message
2017-10-07 16:06:16 -04:00
DL6ER
70ad656af0
Save backup as ".bck~" to prevent reading of the file by dnsmasq
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-07 22:04:14 +02:00
DL6ER
f22b83d379
Create a backup before emptying the list
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-07 17:46:40 +02:00
DL6ER
114f84c948
Add --nuke option to list.sh that can be used e.g. by Teleporter to empty out lists before importing new content
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-07 17:29:47 +02:00
WaLLy3K
43e1121618 Match current style of Web Interface
* Remove border from about menu

Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-04 01:05:44 +11:00