Siddhu
ee86a81ecd
Merge branch 'master' of https://github.com/pi-hole/pi-hole
2017-12-24 19:22:32 +05:30
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
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
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
Siddhu
aa70e24585
Merge remote-tracking branch 'origin/official_migration'
2017-12-08 00:45:09 +05:30
Siddhu
5a7fbfaf47
Merge branch 'master' of https://github.com/arevindh/pi-hole
2017-12-08 00:43:55 +05:30
Siddhu
eb2d86bf19
conflict resolve
2017-12-08 00:32:29 +05:30
Siddhu
3e246f99ca
Fix on merge conflict
2017-12-08 00:31:16 +05:30
Siddhu
a436d55f23
fix for escape char
2017-12-08 00:18:19 +05:30
Siddhu
458c333c2a
Merge branch 'master' of https://github.com/pi-hole/pi-hole
2017-12-07 21:39:11 +05:30
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
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
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
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
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
J den Hartog
96d2a1abfc
Added "-sn Run speediest now" to helpFunc()
2017-10-01 19:40:45 +02:00
DL6ER
ee2169dd13
Merge branch 'development' into tweak/gravity
2017-09-21 17:05:30 +02:00
WaLLy3K
28063aa7f7
Add administrative contact address functionality
...
* Disable shellcheck for SC1090
2017-09-15 00:24:29 +10:00
WaLLy3K
34ae4844fa
Merge branch 'development' into tweak/gravity
2017-09-14 16:44:14 +10:00
DL6ER
b8fedf76cd
Merge pull request #1572 from pi-hole/gedetil-development
...
Add web frontend shutdown command
2017-09-08 20:21:20 +02:00
DL6ER
c9d4995900
Update to comply with current development code
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-08 19:35:05 +02:00
DL6ER
279e809aaf
Use poweroff
instead of halt
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-08 19:33:06 +02:00
DL6ER
0d037e96fb
Merge branch 'development' into gedetil-development
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
Conflicts:
advanced/Scripts/webpage.sh
2017-09-08 19:32:38 +02:00
WaLLy3K
bea99abd8d
Ensure colour consistency between terminal themes
...
* Comment file for review-ability
* Add BOLD and UNDERLINE options
* Select most readable colours out of LIGHT/DARK options
* Provide empty variables for `set -u`
* Deprecate unnecessary variables
* Correct colours for TICK/CROSS/DONE
* Escape r twice and add ESC to OVER
2017-09-05 23:28:33 +10:00
WaLLy3K
7cac207c00
Merge branch 'development' into tweak/gravity
2017-08-28 03:11:38 +10:00
WaLLy3K
1ae403b742
Merge pull request #1667 from pi-hole/install-space
...
Remove erroneous space
2017-08-24 14:00:20 +10:00
Adam Warner
18b41adbf6
Merge branch 'development' into tweak/gravity
2017-07-29 17:14:39 +01:00