Commit graph

5900 commits

Author SHA1 Message Date
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
3b300a4d6a Fix query option handling
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-13 11:42:49 +11: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
7875df0d6b Merge pull request #1723 from pi-hole/tweak/bpcss
Ensure Block Page (#1416) matches current style of Web Interface
2017-10-07 14:53:43 +11:00
WaLLy3K
0d286b99d5 Remove placeholder URL 2017-10-06 20:39:01 +11:00
WaLLy3K
e03d4f2de8 Condense features into three main sections
* Core shows a list of common commands, linking to the new Core Function Breakdown wiki article
* Core also now shows the ASCII Vortex
* Web has had its preview image size reduced
* FTL's functions are elaborated upon more
2017-10-06 20:35:54 +11:00
WaLLy3K
7fddce4a1f Use updated vector logo
* Move Codacy/Build/BountySource badges underneath the H1 header
* Use updated vector logo (Matches the new Pi-hole stickers!)
* Tweak wording for Versatile
* Quote `cd` path instead of escaping string
* Order Projects and Coverage in order of publish date
* Use the current published title for Projects/Coverage links
* Change Projects/Coverage links to use HTTPS if the server supports TLS

Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-06 18:11:05 +11:00
WaLLy3K
3cd8b7d882 Merge pull request #1724 from pi-hole/fix/removejs
Remove superseded index.js: #1696 #1416
2017-10-04 14:11:52 +11:00
DL6ER
3578a3e311 Merge pull request #1718 from pi-hole/tweak/VPNhostnames
Append ".vpn" TLD for OpenVPN host names
2017-10-03 21:32:36 +02:00
WaLLy3K
a9ad8d67aa Remove superseded index.js
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-04 01:13:02 +11: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
Mcat12
7884423e05 Merge pull request #1719 from 19wolf/patch-1
Update basic-install.sh
2017-10-01 12:51:20 -04:00
Eric Wolf
1615fa63e3 Update basic-install.sh
Fixed comment line 40
2017-09-30 16:34:38 -04:00
DL6ER
39ab1e1ea7
When using the Pi-hole DHCP server, local host names are called "something.local". Thir PR ensures that clients that are connected via VPN are augmented by a similar suffix like "someother.vpn".
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-30 13:03:49 +02:00
WaLLy3K
10c048d84a Use "Web Interface" verbiage throughout document
* Also implement other reviewed suggestions
2017-09-30 13:21:29 +10:00
WaLLy3K
a458482e51 Update README.md
* Create consistent style and formatting
* Simplify and/or tweak wording
2017-09-30 00:20:41 +10:00
WaLLy3K
de46dbd56f Ensure domains are consolidated to lower case
* Fix regression caused by #1631
2017-09-27 01:55:17 +10:00
spacedingo
60365ad36a Update gravity.sh 2017-09-26 09:25:47 +04:00
spacedingo
466e6d9b30 Redo pull #1687
Fix for case sensitive duplicate domains
The change (https://github.com/pi-hole/pi-hole/pull/1687) was recently undone.
2017-09-26 05:53:07 +04:00
WaLLy3K
11d48554e3 Merge pull request #1708 from pi-hole/fix/gravityErrors
Place errors on newline
2017-09-25 15:39:26 +10:00
WaLLy3K
b9bcfe36ff Place errors on newline 2017-09-24 11:57:15 +10:00
WaLLy3K
05faa7bdf2 Merge pull request #1707 from pi-hole/fix/tailFunc
Correctly retrieve IPv4/6 addresses for tailFunc()
2017-09-24 10:28:36 +10:00
WaLLy3K
88b1f0ca7f Merge pull request #1702 from pi-hole/fix/activeDomains
Ensure domains files are not deleted upon w/blist
2017-09-24 08:02:47 +10:00
WaLLy3K
f0f7bda2f3 Merge pull request #1704 from celly/lighttpd-hide-files
Exclude files from Web Admin that should not be accessible.
2017-09-23 11:36:03 +10:00
WaLLy3K
664d0ea023 Correctly retrieve IPv4/6 addresses for tailFunc()
* Add comments for readability
* Use `sed -E` for readability
* Move `date` into `sed`
* Use updated colour codes
2017-09-23 11:27:40 +10:00
WaLLy3K
cd7c00ef8e Fix Ctrl-C inadvertently deleting domains files 2017-09-23 10:32:56 +10: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
WaLLy3K
aa1d67a4de Merge pull request #1703 from pi-hole/fix/lighttpdEnabled
Fix `LIGHTTPD_ENABLED` dupes in `setupVars.conf`
2017-09-22 19:21:50 +10:00
WaLLy3K
feb2150d9b Fix LIGHTTPD_ENABLED dupes in setupVars.conf
* Fix issue merged [here](fdf2649f2f (diff-689793e68cde6270d074695b71c969afL1488))
2017-09-22 19:14:11 +10:00
WaLLy3K
3aa525b0c0 Ensure domains files are not deleted upon w/blist 2017-09-22 14:17:56 +10:00
andofrjando
6323d5afed
Use PHP short echo tag to avoid Codacy expecting an escaping function 2017-09-22 07:15:03 +08:00