Adam Warner
246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 21:41:00 +00:00
Ryan Knapper
5ecfc58e5f
Require exact match
...
Updated to require an exact match to reduce false-positives, as suggested by DL6ER.
Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
2018-02-28 13:06:07 -05:00
DL6ER
56a2924a33
Unprivileged processes are subject to full permission checking based on the process's credentials, we have to explicitly allow pihole-FTL to bind to ports < 1024 (port 53 for DNS) and for various advanced network-related operations (to allow for handling DHCP requests)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 23:42:26 +01:00
DL6ER
09886a3f11
Add resolveconf config to pihole-FTL.service
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 10:11:11 +01:00
DL6ER
b87bcc8f5f
Modifications in pihole-FTL.service for FTLDNS
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-24 13:23:06 +01:00
Ryan Knapper
c17d95bfed
Proper output for debug CPU detection
...
Inserted "log_write" to properly output CPU detection lines.
Signed-off-by: Ryan Knapper (ryanknapper@gmail.com>
2018-02-19 10:22:28 -05:00
Mark Drobnak
f14184df30
Merge pull request #1982 from LudovicRousseau/master
...
Create blacklist.txt if not existant
2018-02-18 15:32:01 -05:00
Ludovic Rousseau
47bbea9ba7
Use " " to protect parameter substitution
...
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
2018-02-18 21:20:04 +01:00
Mark Drobnak
7265935cd4
Merge pull request #1915 from ryanknapper/development
...
Add conditional forwarding options to webpage.sh
2018-02-18 12:51:46 -05:00
Ludovic Rousseau
b7891f92a5
Create blacklist.txt if not existant
...
Closes: https://github.com/pi-hole/pi-hole/issues/1888
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
2018-02-18 14:19:49 +01:00
DL6ER
5465ac9ba0
Merge pull request #1929 from pi-hole/fix/flushDB
...
pihole -f: Flush database
2018-02-17 17:45:15 +01:00
DL6ER
b8eaa9a527
Use double quotes to precent globbing and word splitting
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-17 13:01:00 +01:00
DL6ER
5d274008db
Use possibly user-defined database location when flushing
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-17 12:58:57 +01:00
Mcat12
8a42ef431b
Fix Javascript warning when no password is set
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-02-11 21:49:12 -05:00
Mcat12
2cf1f0e8fc
Hide the password input when there is no password
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-02-11 14:07:02 -05:00
Ryan Knapper
f2b3752f3d
lan to local
...
Reduced differences.
Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
2018-02-07 17:08:55 -05:00
Ryan Knapper
36945a67d0
Prevent redundant entries in to adlists.list
...
Grep ${args[3]} and only add if grep -c -eq 0
Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
2018-02-07 17:04:10 -05:00
Mcat12
1a5c86d32e
Revert "Hide password textbox if there is no password"
...
This reverts commit 009fa2f1b7
.
2018-01-23 20:28:43 -05:00
Mcat12
c7219fbdff
Merge remote-tracking branch 'origin/development' into tweak/block-page-no-password
2018-01-21 09:09:36 -05:00
DL6ER
4c249a1186
Flush most recent 24 hours from FTL's database
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-21 13:48:13 +01:00
DL6ER
158ea1d43b
Add sqlite3 dependency
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-21 11:54:49 +01:00
DL6ER
52cc8e2fcf
Use "lan" as fallback TLD for DHCP generated domains
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-16 22:10:27 +01:00
ryanknapper
607664c860
Update webpage.sh
...
Updated webpage.sh to include conditional forwarding options.
2018-01-14 21:01:08 -05:00
Adam Warner
80307a3bcd
Remove update line from cron
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-01-12 15:43:15 +00:00
Vasilis Gerakaris
939806f021
piholeDebug.sh: Correct typo mistake
...
Signed-off-by: Vasilis Gerakaris <vgerak@gmail.com>
**By submitting this pull request, I confirm the following:**
`{please fill any appropriate checkboxes, e.g: [X]}`
- [x] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md ), as well as this entire template.
- [x] I have made only one major change in my proposed changes.
- [] I have commented my proposed changes within the code.
- [] I have tested my proposed changes, and have included unit tests where possible.
- [] I am willing to help maintain this change if there are issues with it later.
- [x] I give this submission freely and claim no ownership.
- [x] It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1 )
- [x] I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html ))
2018-01-12 02:17:31 +02:00
DL6ER
793bdd9743
No need for cat | sed here as we source setupVars.conf, so we can use interface="${PIHOLE_INTERFACE}"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-07 14:36:03 +01:00
DL6ER
9d50f52bb2
Add fallback interface for DNS listening behavior in case PIHOLE_INTERFACE is not set in setupVars.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-07 14:34:02 +01:00
DL6ER
4efb533d2e
Create directories /etc/{var,log}/pihole on startup of pihole-FTL and set proper ownership
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-01 11:26:03 +01:00
DL6ER
afa2e9c2f7
Exchange hard-coded domain "localhost" by hard-coded address "127.0.0.1"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-30 17:44:59 +01:00
DL6ER
a4c8f1a0a4
Merge pull request #1859 from pi-hole/new/extra-logging
...
Enable dnsmasq's extra logging feature
2017-12-28 22:49:43 +01:00
Adam Warner
8e0d76b63b
initiated -> initialized
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-24 13:26:32 +00:00
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
5c2dcb5e74
Enable dnsmasq's extra logging feature
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-21 16:42:55 +01: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
Mcat12
009fa2f1b7
Hide password textbox if there is no password
2017-11-01 21:30:14 -04: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
e7589945a2
Disable password field if no password is set
...
For someone to actually whitelist a domain without a password, more changes will
be needed on the PHP side.
2017-10-07 16:41:30 -04: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
WaLLy3K
97dd1b4cf3
Improve FQDN Authorized Hosts functionality
...
* Use inverse if statement, instead of IF/ELSE when checking setupVars.conf
* Remove $svFQDN
* Add or elaborate on more comments
* Add $serverName to $authorizedHosts if admin has specified `setenv.add-environment = ("fqdn" => "true")` within lighttpd's external.conf
* e.g: `$HTTP["host"] == "pihole.domain.com" { setenv.add-environment = ("fqdn" => "true") }`
* Move "No exact results" check to top of exception handling
* Remove unnecessary IF/ELSE when handling $queryAds error
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-04 00:46:51 +11:00
WaLLy3K
288635abc9
Add comment for include_shell feature
...
* Capitalise first letter for Lighttpd
* Fix spacing
* Add comment for include_shell feature
2017-10-03 22:05:06 +11:00
Celly
3f20981aab
Update access rules to block all root '.' files
2017-09-22 09:29:00 -04:00
Celly
f54a812ad5
Update access rules to block all root '.' files
2017-09-22 09:27:43 -04:00
andofrjando
6323d5afed
Use PHP short echo tag to avoid Codacy expecting an escaping function
2017-09-22 07:15:03 +08:00
Celly
e3e3b4da58
Add in some exclusions form some leaky files in the admin
2017-09-21 17:47:37 -04:00
Adam Warner
ef1ce7d4d6
Merge pull request #1631 from pi-hole/tweak/gravity
...
Clean up and optimise Gravity
2017-09-21 19:58:38 +01:00
DL6ER
ee2169dd13
Merge branch 'development' into tweak/gravity
2017-09-21 17:05:30 +02:00
WaLLy3K
11282aaca3
Decrease local-ttl
to 2
...
* Decreasing value should benefit clients when whitelisting blocked sites, [as per this discussion](https://github.com/pi-hole/pi-hole/pull/1698#issuecomment-331134576 ).
2017-09-21 23:11:44 +10:00
WaLLy3K
f3cc8c71c4
Merge pull request #1691 from pi-hole/new/adminemail
...
Add `pihole -a email` functionality for Block Page contact email
2017-09-19 18:39:37 +10:00
WaLLy3K
500a755250
Delete superseded file
...
* Functionality is reproduced from within the Block Page
2017-09-19 01:03:24 +10:00
andofrjando
5e48b3f7f7
Fix one mistake where $proto
would not be created if $_SERVER['HTTPS']
exists but is not set to on
2017-09-16 11:24:38 +08:00
andofrjando
00d62b3423
This fixes the following bug:
...
If Pi-Hole is behind a reverse proxy that uses SSL, then the block page will not load resources such as `blockingpage.css` and `jquery.min.js` as the insecure `http://` is hard coded. Browsers will block attempts to load insecure resources if the page is loaded of SSL.
The fix is acheived by checking `$_SERVER['HTTPS']` and setting the variable `$proto` to either `http` or `https`. The harcoded `http` is replaced by the contents of this variable.
2017-09-16 10:24:37 +08:00
WaLLy3K
28063aa7f7
Add administrative contact address functionality
...
* Disable shellcheck for SC1090
2017-09-15 00:24:29 +10:00
WaLLy3K
c458e4a93b
Merge pull request #1420 from WaLLy3K/new/https
...
Disable Let's Encrypt HTTPS & shift functions to block page
2017-09-14 20:40:20 +10:00
WaLLy3K
e7ae62ba76
Merge pull request #1416 from WaLLy3K/blockpage2
...
Block Page 2.0
2017-09-14 20:39:45 +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
bab44c52ae
Merge branch 'development' into blockpage2
2017-08-28 13:30:57 +10:00
WaLLy3K
7cac207c00
Merge branch 'development' into tweak/gravity
2017-08-28 03:11:38 +10:00
Adam Warner
199de9ebc0
Merge branch 'development' into new/https
2017-08-27 11:38:30 +01:00
Adam Warner
504ae0193f
Merge branch 'development' into blockpage2
2017-08-27 11:23:21 +01: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
Mcat12
898fdf7a60
Merge pull request #1602 from molikuner/development
...
Fix URL extension parsing
2017-07-29 11:49:24 -04:00
Adam Warner
78143c2ff4
Merge branch 'development' into blockpage2
2017-07-29 16:44:28 +01:00
Adam Warner
7b1524ad01
Merge branch 'development' into new/https
2017-07-29 16:44:20 +01:00
Adam Warner
5799485b0f
Merge branch 'development' into development
2017-07-29 16:29:57 +01:00
Adam Warner
0a9965292c
Additional check to fix any existing cases of "24h" in setupVars.conf automatically.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-28 19:40:13 +01:00
Adam Warner
4fb66e632f
The other h
2017-07-28 16:30:03 +01:00
Adam Warner
5787895794
stop an extra h
being added to leasetime of DHCP server. We already storethe h
in setupVars.conf
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-28 16:10:13 +01:00
Adam Warner
d90489b31d
Include branch we're switching from
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-27 22:21:25 +01:00
Adam Warner
f38912a0c9
- Correctly overwrite ${INFO} boxes with ${CROSS} etc
...
- Notify user that branch has been changed
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-27 21:33:41 +01:00
WaLLy3K
2d8fff099f
Pass correct options to gravity.sh
...
* Optimise $validDomain function by using bashism and `grep`
* Add black/white/wildcard variables to pass to Reload()
* Revert reload variable behaviour
* Ensure Reload() function passes correct options to gravity.sh
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2017-07-27 12:34:26 +10:00
WaLLy3K
fdf2649f2f
Clean up known remaining colour output issues ( #1613 )
...
* Print newline on error message
* Output last three lines of error if update fails
* Consistent error messages & housekeeping
* Add shellcheck directive to ignore COL_TABLE
* Quoted and braced variables for codebase consistency
* Escaped newlines correctly
* Made error messages consistent (indenting and wording)
* Removed consecutive echos
* Conditional formatting consistency
* Braced, quoted and used [[ on conditionals
* Fix specific ShellCheck issues
* Fixed issues that could be safely changed without extensive testing
* Update SELinux whiptail behaviour & more
* Colourised some strings
* Fixed multiple line string indenting
* Made output consistent with existing codebase
* Removed sequential echos
* Make SELinux whiptail use "--defaultno", and change text wording
* Add help text for hostrecord, and colourise output
* this should fix the tests...
Signed-off-by: Adam Warner <adamw@rner.email>
* revert changes to `update_package_cache()` to prove tests
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-26 18:00:08 +01:00
Mcat12
b09c660833
Always process DNS and DHCP settings in installer ( #1630 )
...
* Always process DNS and DHCP settings in installer
* Make sure dnsmasq config exists before modifying it
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
* Make sure the dnsmasq config directory exists
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
* Only remove the DHCP config if it exists (fixes tests, hopefully)
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2017-07-26 17:15:23 +01:00
WaLLy3K
714fd93292
Provide correct FTL stats ( #1619 )
...
* Provide correct FTL stats
* Use the correct lines in the array when displaying FTL stats
* Treat ads_blocked_today/dns_queries_today as currency, like domains_being_blocked is on large screens
* Chronometer Shellcheck validation
* Remove unnecessary \ from CPU usage readout
2017-07-25 23:03:23 +01:00
WaLLy3K
61ff0452e1
Remove duplicate code
...
* Make RestartDNS() use `pihole restartdns`
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2017-07-24 21:27:12 +10:00
WaLLy3K
406098e55a
Speed up refresh time
...
* Add "--blacklist-only" to only run essential gravity functions
* Pass "--wildcard" option to `gravity.sh` to ensure dnsmasq is restarted
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2017-07-24 21:26:39 +10:00
WaLLy3K
49aee8b931
Fixed development branch check
2017-07-19 12:26:00 +10:00
WaLLy3K
f2a3b557c8
Updated Block Page to work with queryFunc output
2017-07-19 00:15:59 +10:00
Adam Warner
0a062d26e6
Merge pull request #1611 from pi-hole/developmentNew
...
Sort out Merge conflicts with master
2017-07-17 14:49:55 +01:00
Adam Warner
eb8333c772
Merge branch 'development' into developmentNew
2017-07-16 16:45:33 +01:00
Adam Warner
247d3ed729
list availible branches for FTL
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-16 13:54:23 +01:00
Adam Warner
031c6428d5
Merge branch 'tweak/checkout_FTL' of https://github.com/pi-hole/pi-hole into tweak/checkout_FTL
...
Signed-off-by: Adam Warner <adamw@rner.email>
# Conflicts:
# advanced/Scripts/piholeCheckout.sh
2017-07-16 13:34:20 +01:00
Adam Warner
f2e9d585f7
* Add helptext for pihole checkout ftl
...
* Only attempt to install FTL if branch was found
* ~~corebranches~~ webbranches (web branches now actually listed)
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-16 13:33:00 +01:00
WaLLy3K
8af9853b9a
Fixed minor formatting issues
...
* Removed useless echo
* Quoted and braced conditionals
* Explicit escaping of newline
* Fixed arrays implicitly concatenating (SC2199)
* Fixed incorrect variable used in checkout web
2017-07-16 22:32:34 +10:00
Adam Warner
783f50657b
Merge branch 'development' into tweak/checkout_FTL
...
Signed-off-by: Adam Warner <adamw@rner.email>
# Conflicts:
# advanced/Scripts/piholeCheckout.sh
2017-07-16 12:25:27 +01:00
WaLLy3K
3631d1349e
Prevent Web Admin from printing restartdns colour codes ( #1575 )
...
* Prevent Web Admin from printing unnecessary msgs
* Make DNS restart behaviour consistent
2017-07-15 11:11:06 +01:00
Adam Warner
7d56e2a937
FTL
has an L
in it, innit?
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-14 20:54:41 +01:00
Jacob Salmela
e1f818ffb7
Tweak/debug improvements ( #1585 )
...
* check for CIDR notation when comparing IPv6 address to that found in setupVars.conf
* highlight bad address entries in pihole.log and reference a corresponding FAQ
* show header output if Pi-holes x-header does not match
* fix automated mode when running from the dashboard. It would previously not automatically upload and generate a token.
* show disclaimer message
* undocumented feature for now: obfuscate domains in pihole.log so they are not visible when sent to the Pi-hole developers. We need to make an additonal flag for this in the pihole command. if the variable OBFUSCATE has a value, it will replace the domain in the log with a placeholder value
* fix small typo in the disclaimer
2017-07-14 16:53:45 +01:00
Molikuner
9934f505a5
Fix URL extension parsing
...
when there is a querystring Pi-hole sometimes parsed a wrong extension
2017-07-13 23:18:40 +02:00
Jacob Salmela
fb66fb12c5
put "no password will be set" on a newline.
2017-07-06 20:54:09 -05:00
Jacob Salmela
042dcf795c
fixes #1430
2017-07-06 20:44:40 -05:00
Jacob Salmela
cb65907e60
Merge branch 'development' of https://github.com/pi-hole/pi-hole into revamp/debug
...
merge in development to avoid shellcheck from travis
2017-07-05 16:55:34 -05:00
DL6ER
bb8a263d70
ShellCheck
2017-07-05 19:34:20 +02:00
DL6ER
70fd94edb3
Edit message when requested branch of FTL is not available
2017-07-05 19:30:05 +02:00
WaLLy3K
1bebcef265
Make Chronometer usable on smaller screens ( #1518 )
2017-07-04 13:52:51 +10:00
DL6ER
6ce79ae1d0
Fix git commands ( #1577 )
2017-07-01 23:52:10 +02:00
Adam Warner
b3eb5c4f0e
Colour Tweaks ( #1549 )
2017-07-01 22:08:17 +10:00
DL6ER
ec4e9780ed
Accept underscores when validating domain names ( #1571 )
2017-06-30 22:52:33 +10:00
Adam Warner
22abbffbb7
Merge branch 'development' of https://github.com/gedetil/pi-hole into gedetil-development
...
Signed-off-by: Adam Warner <adamw@rner.email>
# Conflicts:
# advanced/Scripts/webpage.sh
2017-06-29 19:47:32 +01:00