Commit Graph

2848 Commits

Author SHA1 Message Date
Dan Schaper dfc32b26a6 We test for dpkg lock on line 830 directly, no need for the check also
in the template section.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-05-09 13:11:28 -07:00
WaLLy3K 173ad339bb Update CSS location 2017-05-08 19:33:45 +10:00
Adam Warner 89fd962615 Revert "Ensure any changes to blocking page are updated." 2017-05-06 11:45:31 +01:00
Adam Warner a928cd3fa1 Merge pull request #1437 from pi-hole/blockPage
Ensure any changes to blocking page are updated.
2017-05-06 01:06:22 +01:00
Dan Schaper f190a6ebc5 Merge pull request #1436 from pi-hole/fix/dhcpcd-localhostNS
Update basic-install.sh dhcpcd.conf nameserver
2017-05-05 15:25:12 -07:00
Adam Warner 9beb9fd941 Merge pull request #1384 from pi-hole/checkoutImprovements
Stash changes when switching branches
2017-05-05 23:22:54 +01:00
Adam Warner 525a1228c3 clarify 2017-05-05 22:43:37 +01:00
Adam Warner 19fd25c7cd revert line, looks tidyer 2017-05-05 22:40:10 +01:00
Adam Warner 5b0927ca4b tidy up output 2017-05-05 22:32:27 +01:00
Adam Warner 324d4433c3 even further simplify 2017-05-05 22:31:31 +01:00
Adam Warner 615ca56ea3 fix inteliJ IDEA complaints 2017-05-05 22:27:58 +01:00
Adam Warner 41dd163453 further simplify 2017-05-05 22:27:33 +01:00
Adam Warner 5cd2c77d98 simplify 2017-05-05 22:24:40 +01:00
Adam Warner f270f7430c Update block page. Allow for setupVars setting of CUSTOMBLOCKPAGE (bool) to prevent it being overwritten 2017-05-05 22:10:24 +01:00
Dan Schaper 99b23627d0 Update basic-install.sh 2017-05-05 12:03:51 -07:00
Adam Warner 26fcb1b2a0 Merge pull request #1429 from pi-hole/development
Release v3.0.1
v3.0.1
2017-05-04 15:12:26 +01:00
DL6ER e9c4e8123c Merge branch 'master' into development 2017-05-04 12:12:44 +02:00
Dan Schaper a290e01bdf Merge pull request #1421 from pi-hole/fix/accidental-password-reset
Add option to enter new password as command arg
2017-05-04 03:11:54 -07:00
DL6ER 9cc392fa02 Update Marks PR after the Promo code has been merged 2017-05-04 11:43:48 +02:00
Dan Schaper 7c2046cce7 Merge pull request #1423 from pi-hole/promoLearnsToCode
Double hash the password directly in the install script
2017-05-03 12:07:38 -07:00
WaLLy3K 4d731ca30b Updated landing page location
During development, I had the location of `/pihole/index.php` as just `/index.php`. Just correcting some changes!
2017-05-03 15:33:50 +10:00
WaLLy3K f2016f26d7 Updated splash page CSS href 2017-05-03 15:29:43 +10:00
Adam Warner b13171cc45 $1 is not $pw. Seriously, who let me onto this project 2017-05-02 22:37:38 +01:00
Adam Warner 9c645e2010 Seriously. 2017-05-02 22:30:02 +01:00
Adam Warner bb6f409e89 dropped a " 2017-05-02 22:28:32 +01:00
Adam Warner 61ec7723f6 use function in install script 2017-05-02 22:25:47 +01:00
Adam Warner 9c136a5579 functionise Hashing 2017-05-02 22:24:37 +01:00
Adam Warner a5733508ae Double hash the password directly in the install script 2017-05-02 21:36:08 +01:00
WaLLy3K a8818c16d8 Fixed unnecessary usage of !important 2017-05-02 19:51:13 +10:00
DL6ER c8e1e6dc8a Merge pull request #1418 from pi-hole/tweak/debug/FTL_log
Include pihole-FTL.log in debug report
2017-05-02 09:41:35 +02:00
WaLLy3K 7bcea98d0c Do not activate letsencrypt.conf if found 2017-05-02 17:28:51 +10:00
WaLLy3K 74b15d10d9 Update lighttpd.conf.fedora
Mirror changes found in `lighttpd.conf.debian`
2017-05-02 17:24:55 +10:00
WaLLy3K 356c70cdae Update lighttpd.conf.debian
* Disable `include-conf-enabled.pl`, as blindly enabling HTTPS (as Let's Encrypt does by having a file in that folder) creates Block Page inefficiencies
* Make Block page handle JS request rewrite, allowing users to better utilise their `lighttpd` service
* Make Block page handle debugging Pi-hole header
* Make Block page redirect users from `pi.hole` to `http://pi.hole/admin`
2017-05-02 17:24:07 +10:00
WaLLy3K dfb5c37d98 Delete index.js 2017-05-02 17:21:40 +10:00
DL6ER 30dcf6ff47 Include pihole-FTL.log in debug report 2017-05-02 09:18:58 +02:00
WaLLy3K a0603ad3b7 Update queryFunc()
* Allow scanList() to search files using a wildcard by removing quotes wrapped around `${list}`
* scanList() will not provide a domain ouput on each string if exact is specified (`grep -l`)
* Remove unused processWildcards() function
* Return a message if no domain is specified
* IDN domains are converted to punycode when running a `pihole -q` search if the `python` package is available, otherwise will revert to current behaviour
* Scan Blacklist & Wildcards first, exiting from search if a match is found (Fixes #1330)
* Use one `grep` subshell to search for all "*.domains" lists at once (opposed to looping to get every matching file name, and then spawning a `grep` instance for every matching file)
* queryFunc() will not return "(0 results)" output from files where no match is found
* Sort results based off list number
* Return a message if no results are found
2017-05-02 17:13:55 +10:00
WaLLy3K 551add5f44 Update index.php
* An "About Pi-hole" link on the block page provides an ELI5 explanation to those not familiar with Pi-hole
* An email contact link on the block page provides users of your Pi-hole with a means to easily get in touch with you
* Browsing to your Pi-hole's address will show a simple "landing page", which can be replaced by adding "landing.php" within "/var/www/html"
* Users manually browsing to file/image based content (i.e: non HTML based content) on blocked sites will be greeted with a small "Blocked by Pi-hole" image
* Sites that are manually blacklisted will display a notice of this on the block page
* Sites that aren't directly blocked, but have a CNAME record, will show a notification on the block page (e.g: If raw.githubusercontent.com is not blocked, but github.map.fastly.net is)
* On the block page, "Back to Safety" now directs the user to "about:home" if Javascript is disabled
* Whitelisting is disabled for installs without a password, or if a client does not have Javascript

* Known issues:
  * Admin Console needs a text field under "Web User Interface" where the admin can enter a preferred contact email when a site needs to be whitelisted, to be saved to setupVars.conf with the key "ADMIN_EMAIL"
  * Admin Console needs a text field under "Networking" where the admin can enter their Pi-hole's externally contactable FQDN, allowing access to their landing page when browsing to mypi.duckdns.org, to be saved to setupVars.conf with the key "FQDN"
  * I am not aware of expected output of `$_SERVER["VIRTUAL_HOST"]`, so I have assumed it should be filtered as if it's a domain
2017-05-02 17:06:31 +10:00
WaLLy3K 88944a31ec Update blockingpage.css
* Block page UI overhaul to replicate the style of the Admin Console
* Block page UI is now mobile friendly
* Users can safely customise text in order to make the block page more friendly for their household
2017-05-02 17:05:24 +10:00
DL6ER 3473ebc0fe Merge pull request #1408 from pi-hole/tweak/localise-queries
Add localise-queries flag to dnsmasq's config
2017-05-02 08:56:47 +02:00
Dan Schaper 8c657910ae Merge pull request #1280 from technicalpyro/development
fixes missing dialog package from some distros
2017-05-01 16:07:32 -07:00
Dan Schaper 1886c44579 Merge pull request #1406 from pi-hole/update/UA
Update default User Agent to modern browser.
2017-05-01 14:35:55 -07:00
Adam Warner 1dcc1871fb Merge pull request #1404 from pi-hole/development
3.0
v3.0
2017-05-01 22:03:54 +01:00
DL6ER 19e688effb Add localise-queries flag to 01-pihole.conf 2017-04-30 13:47:07 +02:00
Dan Schaper 6a2b885988 Update default User Agent to modern browser.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-04-27 11:41:08 -07:00
Dan Schaper bfc4775b34 Merge pull request #1297 from raincoats/development
Redirect to admin panel when accessing 'http://pi.hole/'
2017-04-26 12:35:19 -07:00
Adam Warner 981004606b Merge branch 'master' into development 2017-04-26 20:12:34 +01:00
Adam Warner 9d40fd1eda Merge branch 'development' Resolved conflicts
# Conflicts:
#	advanced/Scripts/piholeCheckout.sh
2017-04-26 20:12:16 +01:00
DL6ER db1e5f10ea Make changes according to comment in #1384 2017-04-21 17:08:15 +02:00
DL6ER fbb6b56d99 Merge pull request #1397 from pi-hole/fix/ipv4ipv6error
Bugfix: Blocking page
2017-04-20 16:18:50 +02:00
DL6ER f1f70133dc Populate $ipv4 and $ipv6 + fix small error that prevented blocking page from coming up at all. Fixes #1396 2017-04-20 13:53:27 +02:00