WaLLy3K
3bd677c102
Show help for "pihole -v -h"
...
* Indent output text
* Minor help text change
2017-05-14 11:57:46 +10:00
WaLLy3K
0e4473685b
Show help for "pihole -a -i --help"
2017-05-14 11:47:56 +10:00
WaLLy3K
b721ed49ab
Update Help Output ( #1467 )
...
* File consistency
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Standardise core help text
* Added help text for disable command
* Added help text for logging command
* Clean up
* Fixed certain new lines and spaces
* Sync with development branch
* Formatting consistency
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces
* Admin help text
* Added help text for interface command
* Sync with development branch
* Formatting consistency
* Tabs to 2 spaces
* Fixed some wording
* Fixed certain spaces
* Formatting consistency
* Minor wording changes
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces
* Blacklist help text
* Formatting consistency
* Tabs to 2 spaces
* Corrected indenting
* Cronometer help text
* Formatting consistency
* Fixed certain newlines and spaces
* Corrected indenting
* Checkout warning alteration
* Add checkout help text
* Corrected help output
2017-05-14 11:11:44 +10:00
Dan Schaper
25601b9fcc
Document sed substitution for user readability
...
Comment the oneliner with explanations of what each step does.
2017-05-13 17:49:58 -07:00
Adam Hill
55f78e3b64
Update list.sh
...
I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)
2017-05-13 18:44:41 -05:00
WaLLy3K
f9d41caeb6
Merge branch 'development' into blockpage2
2017-05-13 23:29:44 +10:00
Hans Geiblinger
b166410cbf
Solve piholeLogFlush.sh having to be issued 2 x to clear logs ( #1460 )
...
Simplified the command -v syntax, and added a sleep 3 timer to the first execution of the log rotation. The second execution was being issued while the first was still running, thus it would fail and you would have to issue the "Flush Logs" command a second time.
2017-05-12 22:39:55 +02:00
0412465564
31d5a7ae9e
whitelist on website blocked doesnt work ( #1452 )
...
Since Pi-hole redirects ad domains to itself, accessing the script via de.ign.com is the same as pi.hole in this case. The fix should be as simple as adding a / before admin on this line.
2017-05-12 22:29:07 +02:00
Dan Schaper
5bb91759b4
Merge pull request #1459 from WaLLy3K/patch-2
...
Provide remote hashes for version.sh
2017-05-12 12:38:13 -07:00
Dan Schaper
80c4b7c9bb
Merge pull request #1455 from pi-hole/tweak/logecho_gateway
...
Debug: Log and echo gateway responses
2017-05-12 12:02:21 -07:00
WaLLy3K
ea0a9ceb37
Provide remote hashes for version.sh
...
* Provide remote hashes for comparison
* Use double braces for all conditions (for consistency)
* Suppress potential "cd" error output
* Provide "not applicable" output upon any hash request for FTL
2017-05-12 15:25:01 +10:00
WaLLy3K
f875976268
Replacing superseded file with dummy content
2017-05-11 21:02:04 +10:00
WaLLy3K
1c2aa44d46
Provide notice message for whitelisted sites
2017-05-11 20:10:40 +10:00
WaLLy3K
3b44a0da32
Provide error message if not found in any list
2017-05-11 20:09:00 +10:00
Dan Schaper
501b26decd
Log and echo gateway responses
2017-05-10 22:08:06 -07:00
WaLLy3K
c6596f2c54
Modified syntax to be valid for Shellcheck
2017-05-11 14:19:13 +10:00
WaLLy3K
2863308090
Minimise string duplication & other minor changes
...
Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().
2017-05-11 13:34:58 +10:00
WaLLy3K
7fef1fdc83
Fixed indentation
2017-05-11 10:11:04 +10:00
WaLLy3K
fe0a35cc7a
Update -h to work as --hash
...
Also provide error output as per https://github.com/pi-hole/pi-hole/pull/1447#issuecomment-300600093
2017-05-11 08:30:49 +10:00
WaLLy3K
03201e2f20
Display FTL version & version.sh rewrite
...
While testing to make sure `pihole -v` would output `pihole-FTL version`, I noticed some options didn't work how I expected them to. For example, if I use `pihole -v -p`, I would expect to see the version output of Pi-hole Core. Instead, I'm informed that it's an invalid option.
I've had the following things in mind while rewriting this:
* I'm operating under the assumption that FTL is only installed if the Admin Console is (Line 113 exit 0)
* I have modified the help text to only output with `pihole -v --help`
* I have modified all output to be more similar to the output style of `grep` and `curl` (Ditching ":::")
Testing output:
```
w3k@MCT:~$ pihole -v
Pi-hole version is v3.0.1-14-ga928cd3 (Latest: v3.0.1)
Admin Console version is v3.0-9-g3760482 (Latest: v3.0.1)
FTL version is v2.6.2 (Latest: v2.6.2)
w3k@MCT:~$ pihole -v -c
Current Pi-hole version is v3.0.1-14-ga928cd3
Current Admin Console version is v3.0-9-g3760482
Current FTL version is v2.6.2
w3k@MCT:~$ pihole -v -l
Latest Pi-hole version is v3.0.1
Latest Admin Console version is v3.0.1
Latest FTL version is v2.6.2
w3k@MCT:~$ pihole -v -p --hash
Current Pi-hole hash is a928cd3
2017-05-10 13:07:56 +10:00
WaLLy3K
173ad339bb
Update CSS location
2017-05-08 19:33:45 +10: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
DL6ER
9cc392fa02
Update Marks PR after the Promo code has been merged
2017-05-04 11:43:48 +02: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
9c136a5579
functionise Hashing
2017-05-02 22:24:37 +01:00
WaLLy3K
a8818c16d8
Fixed unnecessary usage of !important
2017-05-02 19:51:13 +10: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
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
19e688effb
Add localise-queries flag to 01-pihole.conf
2017-04-30 13:47:07 +02: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
DL6ER
db1e5f10ea
Make changes according to comment in #1384
2017-04-21 17:08:15 +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
DL6ER
320c06e0a4
Flush twice to move data out-of-sight of FTL
2017-04-17 21:25:15 +02:00
Adam Warner
2e398c5da4
stash changes on branch switch, else it fails if any changes have been made.
2017-04-14 17:20:13 +01:00
DL6ER
fcd92d27f7
Don't use PID file but rather "pidof pihole-FTL" for detecting if another process is already running
2017-04-12 15:12:09 +02:00
DL6ER
3eacfa9831
Improve FTL's service script
2017-04-12 14:13:18 +02:00
gedetil
ff6df76e36
Update webpage.sh
...
Implement "Halt system" button, next to "Restart system" button, on
admin/settings page. Useful for doing clean shutdown before powering off.
(This affects 4 files, 3 for the web content, 1 for backend script.)
Gilbert Detillieux <gedetil> 2017-04-11
2017-04-11 12:04:44 -05:00
Mcat12
a96b4d28e1
Merge pull request #1365 from pi-hole/adlistImprovements
...
Adlist improvements
2017-04-06 16:15:50 -04:00
Mcat12
57e8b7f924
Merge pull request #1355 from pmo3/development
...
Mask password input when changing password
2017-04-03 20:23:19 -04:00
Flo
7e0aa822b6
Match the Pi-hole brand ( #1358 )
...
* Update README.md
* Update index.php
* Update basic-install.sh
* Update piholeCheckout.sh
* Update update.sh
* Update CONTRIBUTING.md
* Update the Pi-hole brand tip in CONTRIBUTING.md
Use a better formulation.
* Update README.md 2
2017-04-03 17:29:57 +02:00
DL6ER
ad9575ce18
Recognize more host names
2017-04-03 16:28:18 +02:00
Adam Warner
3cf9942465
spacing fixed
2017-03-31 23:00:56 +01:00
Adam Warner
153031482f
Add delete mode to adlist command. Might be abetter way to do this
2017-03-31 22:51:10 +01:00
Adam Warner
af2cff5177
remove call to user list
2017-03-31 20:13:04 +01:00
Adam Warner
5435b93df2
remove spaces
2017-03-31 20:05:45 +01:00
Adam Warner
3a3dde6298
add adlist argument redirector
2017-03-31 20:03:56 +01:00
Adam Warner
b4bc90fb85
add in CustomizeAdlists function
2017-03-31 19:35:52 +01:00
DL6ER
f09c166350
Improve Error 404 page behavior
2017-03-28 14:02:00 +02:00
Patrick O'Brien
24868fdb2b
Merge remote-tracking branch 'upstream/development' into development
2017-03-27 13:38:19 -04:00
Patrick O'Brien
a463250ecf
don't hash an empty password
2017-03-27 13:37:19 -04:00
Flo
6eb9192cd1
Complete site
...
The start <html>-tag was missing.
2017-03-25 16:11:37 +01:00
Patrick O'Brien
94f15f1b3c
Merge remote-tracking branch 'upstream/development' into development
2017-03-23 18:47:50 -04:00
Patrick O'Brien
ee296f36c1
mask password input on command line
2017-03-23 18:47:30 -04:00
Mcat12
fb3e6ee35c
Source setupVars before attempting to use it
...
Fixes #1347
2017-03-21 18:01:51 -04:00
Dan Schaper
2740c68a63
Merge pull request #1335 from pi-hole/tweak/debug_templog
...
Debugging tweaks for temporary logfiles
2017-03-16 23:35:15 -07:00
Dan Schaper
b1f769b671
Output cleaning, IP stack check headers.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-15 23:50:29 -07:00
Dan Schaper
77378da70a
Cat out temp files to final log.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-15 23:43:41 -07:00
Dan Schaper
160030b75f
Quiet systemctl output to just the current daemon status.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-15 23:27:18 -07:00
Dan Schaper
0a0c3a2fb7
Copy working temp to final location.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-15 23:20:12 -07:00
Dan Schaper
e9f1ca338f
Create temp files for working storage, log to working storage temps.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-15 22:49:47 -07:00
Adam Warner
cfaf1ac67c
add check on file_parse to not include WEBPASSWORD= in the debug log
2017-03-15 18:59:41 +00:00
Adam Warner
6b862dd9e9
Only remove from wildcard list if domain is being added to whitelist or blacklist
2017-03-13 20:38:34 +00:00
Markus Napp
bb7a7d94ef
Replace misleading letter variable
2017-03-12 16:16:45 +01:00
Markus Napp
9a475cc010
Rewrite help text for better handling of params
2017-03-12 15:50:48 +01:00
Markus Napp
ae30c285a2
Fix handling of wildcard help text
2017-03-12 15:45:11 +01:00
Dan Schaper
2e74219ff9
Merge pull request #1313 from pi-hole/new/piholecheckout
...
Checkout adjustments
2017-03-11 13:01:11 -08:00
Dan Schaper
b0ae954f1e
Only update when update flag is set to "true"
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-11 12:37:36 -08:00
Dan Schaper
a2404f104a
Just some style and linting. And a cd in fetch_checkout_pull_branch
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-11 12:21:15 -08:00
DL6ER
38547ced7a
Can only diff once upstream branch is tracked
2017-03-11 16:55:37 +01:00
DL6ER
9a9d9007cd
Add missing "== true"
2017-03-11 16:49:47 +01:00
DL6ER
bd2d81f691
source setupVars.conf to see if INSTALL_WEB is true or not
2017-03-11 16:46:52 +01:00
DL6ER
1b9e7fbf2e
Test if branch is locally available is not reliable because of possible ambiguities
2017-03-11 16:40:10 +01:00
DL6ER
d4a49d192f
Correct variable name
2017-03-11 16:38:28 +01:00
DL6ER
8cb66544d2
Remove "\ "
2017-03-11 16:36:54 +01:00
DL6ER
140ac192aa
The web repo might actually be missing and this is n error (not installed because the user didn't want it)
2017-03-11 16:30:58 +01:00
DL6ER
b961b13d60
Small bugfix
2017-03-11 16:27:00 +01:00
DL6ER
febdb4a190
Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all)
2017-03-11 16:24:13 +01:00
DL6ER
1d60b62e7a
Testing alternative way of fetching/checking out of a single branch
2017-03-11 16:11:23 +01:00
Dan Schaper
41e1e4cb68
Rearrange pull logic, some optimization.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 11:25:35 -08:00
Dan Schaper
d5b88e0df8
Get the right name for the options.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 11:07:58 -08:00
Dan Schaper
20fd61468d
Require branch to check out
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 11:04:37 -08:00
Dan Schaper
0a0d25dff4
Script runs in subshell, no need to cd back to pwd.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 10:57:46 -08:00
raincoats
1590a179fa
Change 302 redirect to 301
...
Change "302 Found" response to "301 Moved Permanently", as "302 Found" is meant for temporary redirects.
Was asked to do so in this comment: https://github.com/pi-hole/pi-hole/pull/1297#issuecomment-284335421
2017-03-09 17:38:56 +11:00
DL6ER
2b3afbfef8
Merge pull request #1310 from pi-hole/new/piholecheckout
...
Pi-hole checkout feature
2017-03-09 00:43:35 +01:00
DL6ER
81a1057cac
Fix something Dan has overlooked
2017-03-09 00:30:36 +01:00
DL6ER
fd310c6445
Back to how we had it before, because --unshallow does not work at all
2017-03-09 00:28:02 +01:00
Dan Schaper
a9b52518bf
Shift numbers for argument identifiers, functions are called after shift
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 14:29:51 -08:00
Dan Schaper
87da40068c
Always exited with value 1, now exits with proper value.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 14:18:08 -08:00
Dan Schaper
b8f1eadb7f
Shift off checkout from being passed to script from pihole
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 14:17:56 -08:00
Dan Schaper
b522d8eaf6
Source and reuse existing variables, centralize code.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 13:41:11 -08:00
Dan Schaper
89ff99322d
Don't need to remember pwd inside a function, calling function doesn't change directories.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 13:30:08 -08:00
Dan Schaper
56e17d1010
Source functions and variables from basic-install.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 13:28:24 -08:00
DL6ER
d2ab0694b7
Add "master" shortcut
2017-03-08 13:18:34 +01:00
DL6ER
8a14a63d5d
Pi-hole checkout feature
2017-03-08 13:16:40 +01:00
DL6ER
8235b18854
Remove duplicated line
2017-03-08 12:09:34 +01:00
DL6ER
e0e9ebbe74
Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface
...
Don't try to obtain version of web interface it it is not installed
2017-03-07 23:54:32 +01:00
DL6ER
10bc8414b9
Move FTL querying before clearing the terminal to avoid flashing on Pi B+
2017-03-07 18:10:05 +01:00
DL6ER
4e25e0dc5c
Add missing } to JSON output
2017-03-07 17:57:57 +01:00
DL6ER
b1a9793d94
Let Chronometer query all data from FTL (no need for having the API). Fixes #1305
2017-03-07 17:54:11 +01:00
DL6ER
6dea00668e
Don't try to obtain version of web interface it it is not installed. Fixes #1303
2017-03-07 13:08:01 +01:00
DL6ER
ae9182c92e
Merge pull request #1301 from pi-hole/fix/removewildcard
...
Remove wildcard entry when adding the very same domain either the white- or blacklist
2017-03-06 23:53:06 +01:00
DL6ER
cf31561267
Remove wildcard entry when adding the very same domain either the white- or blacklist
2017-03-06 16:25:35 +01:00
DL6ER
a97f0b1298
Merge pull request #1300 from pi-hole/fix/deletehostrecord
...
Bugfix for when deleting host-record
2017-03-06 16:16:42 +01:00
Dan Schaper
d1e0f3ae18
Merge pull request #1294 from pi-hole/tweak/debugDNS
...
Tweak DNS debugging
2017-03-06 05:50:37 -08:00
DL6ER
47a6786e8f
Use proper test syntax
2017-03-06 14:02:56 +01:00
DL6ER
a69fcbb91e
Bugfix for when deleting host-record
2017-03-06 13:44:13 +01:00
Dan Schaper
8e2b51b391
Merge pull request #1296 from pi-hole/fix/debugVersion
...
Debug version detection improvements
2017-03-05 07:13:41 -08:00
Dan Schaper
560af43204
Merge pull request #1293 from pi-hole/fix/version
...
Account for hash in versioning
2017-03-05 07:10:18 -08:00
DL6ER
baefec86f2
Add CLI teleporter feature
2017-03-05 14:08:44 +01:00
raincoats
eb763d2dc2
Redirect to admin panel when accessing ' http://pi.hole/ '
...
If someone tries to access 'http://pi.hole/ ', it will take them to the "Website blocked" page. Very confusing if you don't know to go to 'http://pi.hole/admin/ '. This just redirects them to the admin panel.
2017-03-05 16:58:21 +11:00
Dan Schaper
512c650441
Shellchecking.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 19:07:55 -08:00
Dan Schaper
dc44fc9e27
Version check amalgamation and removal of && || logic.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 17:54:38 -08:00
Dan Schaper
6f2fb57c08
Protocol specific records checks.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 15:16:33 -08:00
Dan Schaper
2547cc4c8d
Only run IPv6 if enabled, split out Chaos TXT checks.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 15:06:34 -08:00
DL6ER
9f4ef66f41
Add IPv6 resolver test
2017-03-04 22:38:52 +01:00
DL6ER
086f0790fc
Add Google's IPv6 address for potential IPv6 resolver tests
2017-03-04 22:31:18 +01:00
Dan Schaper
709b44f736
IPv4 DNS tests
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 12:16:43 -08:00
Dan Schaper
6cd4ff6d68
Organize functions and function calls.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 12:16:32 -08:00
Dan Schaper
abd3e828de
Optimize normalOutput
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 07:46:00 -08:00
DL6ER
b85af50d14
Generate only the information that is actually asked for
2017-03-04 14:08:11 +01:00
Dan Schaper
0e8fd49669
Function...
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 23:30:57 -08:00
Dan Schaper
945e22874e
Collapse duplicate functions, and take out argument loops.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 23:12:28 -08:00
Dan Schaper
77ab47a984
Awk for perl
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 22:34:55 -08:00
Dan Schaper
ed8088f203
Functions for Core/Web version and hash. And only check first argument in each section.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 22:10:32 -08:00
Dan Schaper
8831b22fc8
Prototype function for getting version of local repo
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 21:36:38 -08:00
Dan Schaper
0341bd1758
Optimize code, undoc flag for current hash.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 20:32:26 -08:00
Dan Schaper
9bb4a5fb25
Factor out variables from display.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 20:16:53 -08:00
Dan Schaper
ebfffea5dc
Always show something, even if it's just the short hash of the latest commit.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 20:04:55 -08:00
Dan Schaper
81939ab265
Get short hash of local and remote
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 19:14:30 -08:00
DL6ER
f2fe84c9d3
Merge pull request #1292 from pi-hole/master
...
Merge patches back into devel
2017-03-03 23:45:29 +01:00
DL6ER
f626406685
Revert #1273
2017-03-03 23:14:12 +01:00
DL6ER
dd971b6ee5
Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)
2017-03-03 22:58:41 +01:00
DL6ER
f1b8abf503
Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked
...
[FTL] Show most recently blocked domain in chronometer
2017-03-03 12:20:43 +01:00
DL6ER
66b7d04b82
Merge branch 'development' into new/FTL-binary
2017-03-01 12:42:48 +01:00
DL6ER
7ba47f504c
Add special "except-interface" line in case of listening on all interfaces
2017-03-01 12:15:04 +01:00
DL6ER
0be1717ff4
Fix config error
2017-03-01 11:46:48 +01:00
DL6ER
189a4e0078
Add option to skip restarting of dnsmasq
2017-03-01 11:26:06 +01:00
DL6ER
3adf8785d8
Move "all" down in help text to not suggest that it is the default
2017-03-01 11:07:05 +01:00
DL6ER
b74862bfc5
Actually apply new setting by restarting dnsmasq
2017-03-01 11:02:08 +01:00
DL6ER
01273124ea
Change to -i, interface
2017-03-01 10:59:55 +01:00
DL6ER
721ada7e16
Fix typo
2017-03-01 10:52:21 +01:00
DL6ER
bd9dc91396
Add response for users manually setting this up via CLI
2017-03-01 10:50:13 +01:00
DL6ER
de6c43a8d3
Setup interface listening behavior of dnsmasq
2017-03-01 10:46:20 +01:00
Dan Schaper
f6fc6a5e56
Merge pull request #1281 from pi-hole/tweak/web_debug
...
Back end changes for Web based debug calls.
2017-02-27 12:21:33 -08:00
Dan Schaper
83b0600863
Carriage return or newline based webcalls.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 11:03:57 -08:00
Dan Schaper
6c130b7960
Vebiage and highligh the token, also :::
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 10:27:11 -08:00
Dan Schaper
7244d44a1d
Notify user that log is being uploaded.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 10:02:00 -08:00
Dan Schaper
9b060aab34
Debug auto mode engaged
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-26 18:22:06 -08:00
DL6ER
ec7e75a6e3
Don't save interface= line to dnsmasqs config file
2017-02-24 16:02:24 +01:00
DL6ER
ce6c465942
Merge pull request #1266 from pi-hole/new/host-record
...
Add host-record option
2017-02-23 17:32:10 +01:00
Jacob Salmela
7a1a2dec67
update license to EUPL on core files
2017-02-22 11:55:20 -06:00
DL6ER
7ed1bbad49
Add host-record option
2017-02-22 14:43:07 +01:00
DL6ER
078cc7660e
Improved updater logic
2017-02-22 11:00:45 +01:00
DL6ER
af2893d2ce
Updater implementation for FTL
2017-02-22 10:43:13 +01:00
ProtoFoo
fb6631d317
Removed a line that did nothing.
2017-02-21 22:22:30 +01:00
ProtoFoo
cd0b8927c5
Removed a line that did nothing.
2017-02-21 22:22:03 +01:00
ProtoFoo
3fab34687c
Redirect pi.hole to pi.hole/admin/
2017-02-21 20:38:09 +01:00
ProtoFoo
b2d78edae9
Redirect pi.hole to pi.hole/admin/
2017-02-21 20:36:59 +01:00
DL6ER
a64211123f
Some debug additions
2017-02-21 16:46:54 +01:00
DL6ER
4f85ace525
Force pihole user to use sh-shell (instead of nologin)
2017-02-21 14:46:53 +01:00
DL6ER
e8fde702a0
Also chown the other files
2017-02-21 11:52:07 +01:00
DL6ER
e339f3852c
Change ownership of FTL log to pihole user
2017-02-21 11:50:08 +01:00
DL6ER
032f94afc0
Don't suppress su's output
2017-02-21 11:46:31 +01:00
DL6ER
90ccbef431
pihole-FTL init.d script
2017-02-21 11:18:47 +01:00
Adam Warner
a7def771c8
Revert "redirect pi.hole to pi.hole/admin"
2017-02-19 20:12:32 +00:00
Adam Warner
543f1243e2
Merge pull request #1241 from pi-hole/feature/redirect-pi-hole-to-admin
...
redirect pi.hole to pi.hole/admin
2017-02-18 20:59:03 +00:00
Dan Schaper
053b38e0bd
Set up for IP matching in detection.
2017-02-16 19:45:44 -08:00
Dan Schaper
2aa3a109a0
Ping gateways and Internet.
2017-02-16 18:38:05 -08:00
Dan Schaper
472708376d
Split out IP checks.
2017-02-16 18:30:15 -08:00
Dan Schaper
cfed3d59e9
Begin fixing IP detection functions.
2017-02-16 16:49:14 -08:00
Jacob Salmela
26cb6a1929
redirect pi.hole to pi.hole/admin
2017-02-11 20:46:27 -06:00
Jacob Salmela
7c63bbfe44
Merge pull request #1233 from ProtoFoo/patch-1
...
Add manual edit warnings to lighttpd.conf.* files
2017-02-11 08:10:35 -06:00
DL6ER
af8e629df4
Merge pull request #1239 from pi-hole/tweak/debug48h
...
Change description as we want to save the debug log for 48h instead of only 24h
2017-02-10 20:46:12 +01:00
DL6ER
01f980d49c
Change description as we want to save the debug log for 48h instead of only 24h
2017-02-10 17:45:20 +01:00
DL6ER
99fab7e52a
Scan whole dnsmasq.d directory for cofigurations files
2017-02-10 17:42:37 +01:00
Mcat12
ba67144e34
Merge branch 'development' into adminPageAsOption
2017-02-09 16:27:07 -05:00
ProtoFoo
162d9d7d57
Add manual edit warning
...
Added text block from 01-pihole.conf to warn user that manual changes to lighttpd config will be overwritten.
Slight cosmetic adjustments (tabs -> spaces).
2017-02-09 17:00:52 +01:00
ProtoFoo
357f5a2cfd
Add manual edit warning
...
Added text block from dns config file to warn user that manual changes to lighttpd config will be overwritten.
Slight cosmetic adjustments (tabs -> spaces).
2017-02-09 16:46:55 +01:00
DL6ER
7785dac50e
Merge pull request #1228 from r0ckarong/development
...
Justify and improve help texts, add missing wildcard description
2017-02-08 14:05:53 +01:00
Markus Napp
01f643e5eb
fixup! Fix spacing for wildcard help in list script
2017-02-08 12:56:28 +01:00
Markus Napp
8037f3e332
Fix spacing for wildcard help in list script
2017-02-08 12:55:14 +01:00
Markus Napp
afe5176e01
Justify help output to match main script
2017-02-08 12:41:53 +01:00
Mcat12
a48317883d
Fix indentation
2017-02-07 18:14:41 -05:00
Promofaux
4fcf8fd23f
Merge in development branch - resolve conflict in update.sh
2017-02-05 19:39:02 +00:00
Promofaux
10a30344e5
No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception.
2017-02-05 19:29:56 +00:00
Promofaux
b764d17c64
comment
2017-02-05 19:18:27 +00:00
Promofaux
ba0abdb88d
wrap update logic in admin_installed bool check
2017-02-05 19:12:09 +00:00
Promofaux
1428b58dde
source setupVars and only check admin repo if it is enabled
2017-02-05 19:07:04 +00:00
Mcat12
18eb8a2159
Merge pull request #1185 from pi-hole/cleanup/git_functions
...
Move git functions to one script
2017-01-31 19:05:53 -05:00
DL6ER
3239c7023a
Merge pull request #1170 from pi-hole/new/DHCPstaticleases
...
Backend changes for static DHCP leases
2017-01-31 21:07:36 +01:00
DL6ER
da05491992
Merge pull request #1192 from pi-hole/fix/regex
...
Remove misplaced start of string expression
2017-01-30 21:25:45 +01:00
DL6ER
3d4516dc95
Improve regex
2017-01-29 20:27:20 +01:00
DL6ER
509c864cc3
Merge branch 'development' into fix/regex
2017-01-29 20:27:04 +01:00
DL6ER
8b22f435ad
Change how user and group are stored in the logrotate config file (necessary on Ubuntu 16.04.1)
2017-01-29 19:58:53 +01:00
Mcat12
f8944177a0
Fix chronometer interpreting summaryRaw
2017-01-29 13:32:48 -05:00
DL6ER
06873fe69e
Remove misplaced start of string expression. Fixes #1191
2017-01-29 13:54:39 +01:00
Dan Schaper
3d9d13222b
Use constants for leading paths.
2017-01-28 17:42:55 -08:00
Dan Schaper
745adabb05
Path to source basic-install.sh
2017-01-28 17:38:14 -08:00
Dan Schaper
3861b57dc6
Start moving reused utility functions to one script.
2017-01-28 17:32:42 -08:00
Dan Schaper
99a4a80017
Spelling
2017-01-28 17:08:38 -08:00
Mcat12
033ba26041
Stay in repo directory until we error check
2017-01-28 20:00:02 -05:00
DL6ER
08cddba200
There should be no echo here
2017-01-28 21:49:31 +01:00
DL6ER
1bf43b0425
Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain
2017-01-28 21:48:19 +01:00
DL6ER
85b3fef08d
Use perl instead of grep?
2017-01-28 00:39:10 +01:00
DL6ER
15037fa888
Typo
2017-01-28 00:17:32 +01:00
DL6ER
d595fef18f
Fix regex
2017-01-28 00:15:06 +01:00
Dan Schaper
be5fa22b6f
Merge pull request #1174 from pi-hole/tweak/logrotate_insecure_directory
...
Improve logrotate support
2017-01-27 11:18:06 -08:00
DL6ER
6fd7e0311c
Install customized version of logrotate script
2017-01-27 14:16:24 +01:00
DL6ER
1bcf2dd0fc
Tweak CLI domain filter
2017-01-27 00:45:57 +01:00
DL6ER
dad18dc5de
Changed keywords
2017-01-25 10:35:45 +01:00
DL6ER
5c95c4074b
Remove static leases from DHCP static leases file
2017-01-25 10:35:03 +01:00
DL6ER
4301b9a12a
Add static DHCP leases to new file
2017-01-25 10:33:25 +01:00
DL6ER
6a89c6bf3b
Silence rm warning if no DHCP server is used
2017-01-23 15:06:36 +01:00
Promofaux
fe8c365d17
codacy never lies
2017-01-22 20:53:30 +00:00
Promofaux
9acc3aac01
pipe du -h output to awk to ensure we only get the file size, and not the filename too. Yeah that's right Dom, pipe.
2017-01-22 20:44:07 +00:00
Promofaux
1ad23a065e
switch out wc -l with grep -c ^
2017-01-22 20:38:46 +00:00
Promofaux
de102fde5c
Add line count and size check for pihole.log
2017-01-22 20:38:09 +00:00
DL6ER
8bb9dd460b
Be able to disable the DHCP domain name
2017-01-18 12:22:03 +01:00
Mcat12
58f3ff69d8
Align comment with referenced line
2017-01-16 18:51:13 -05:00
DL6ER
72d8d10e64
Show most recently blocked domain in chronometer (using FTL). Fixes #717
2017-01-16 22:39:58 +01:00
Mcat12
63d02df0bc
Merge pull request #1130 from pi-hole/new/logrotate
...
Use logrotate for pihole.log
2017-01-16 15:11:11 -05:00
DL6ER
08f08fea61
Merge pull request #1135 from pi-hole/new/multipleDNSservers
...
Allow multiple DNS servers
2017-01-13 23:48:38 +01:00
DL6ER
1ed2a8637f
Removed debug echo's
2017-01-13 23:39:57 +01:00
Mcat12
d196c13f2c
Merge pull request #1131 from pi-hole/chronometerJsonUnixTools
...
No excuse for chronometer not to match API
2017-01-13 16:34:51 -05:00
DL6ER
bd1c5a42e8
Allow multiple DNS servers
2017-01-13 17:49:55 +01:00
DL6ER
845d8c0e63
Ensure LC_NUMERIC=C is set when evaluating floating point number (non-English systems might expect "," as decimal separator
2017-01-13 12:59:49 +01:00
DL6ER
bcb8a52418
Added user to cron file
2017-01-13 11:57:07 +01:00
Promofaux
b4c32e47c6
Missed one!
2017-01-12 22:07:07 +00:00
Promofaux
248d8680f7
actual codacy complaints
2017-01-12 21:51:10 +00:00
Promofaux
1bda965a7c
Codacy complaints
2017-01-12 21:50:16 +00:00
Promofaux
2ee305769d
Replace all calculations with values read directly web admin API. Parse JSON using native unix tools, no additional requirements needed.
2017-01-12 21:23:58 +00:00
DL6ER
3a8a936575
Corrected path
2017-01-12 21:01:52 +01:00
DL6ER
6b6fbc4709
Remove --force on @reboot
2017-01-12 20:41:25 +01:00
DL6ER
3fd2ffd466
Add logrotate for pihole.log
2017-01-12 20:39:25 +01:00
DL6ER
b56ca2b834
Add DNSSEC support to Pi-hole core
2017-01-12 16:02:41 +01:00
Mcat12
df7671d393
Add a few comments and remove debug output
2017-01-11 18:01:27 -05:00
DL6ER
a263936243
Merge branch 'development' into wildcardblacklisting
2017-01-11 18:25:51 +01:00
DL6ER
11924d425b
Hide whitelist option if we detected that the domain as blocked due to wildcard blocking
2017-01-11 17:07:08 +01:00
DL6ER
6b3aea933d
Add info that whitelisting blocked pages does not work
2017-01-09 15:02:31 +01:00
DL6ER
2935275227
Merge branch 'development' into wildcardblacklisting
2017-01-09 14:53:01 +01:00
DL6ER
74a4e62cc9
Codacy fix
2017-01-08 11:26:56 +01:00
DL6ER
63a414a544
Align outputs
2017-01-08 11:21:50 +01:00
DL6ER
7d1f5091a7
Fixed small typo
2017-01-08 11:21:10 +01:00
DL6ER
3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log
2017-01-08 11:17:25 +01:00
DL6ER
d9e949b27c
Merge pull request #1096 from pi-hole/fix/updater
...
Fix updater failing on non-English systems
2017-01-06 23:36:42 +01:00
DL6ER
168397e90d
Fixed typo in webpage.sh
2017-01-05 21:45:06 +01:00
DL6ER
e3c1fcd2c6
NEW LOGIC FOR THE UPDATER
...
Compare local and remote hashes. Update is available if current remote hash is different from current local hash since we assume that local should never be newer than remote for user
2017-01-05 13:10:19 +01:00
DL6ER
200995bf29
Make IPv6 features of Pi-hole DHCP server switchable
2017-01-03 14:24:33 +01:00
DL6ER
3a90c1c192
Source setupVars.conf before trying to access variables
2017-01-03 13:34:01 +01:00
Adam Warner
12bec1df68
Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
...
Major simplification of webpage.sh + extend DHCP to IPv6
2017-01-02 14:28:26 +00:00
DL6ER
ad61852804
Test against empty string
2017-01-02 11:10:38 +01:00
DL6ER
dbd8aee4ee
Add 'local' domain if not set in setupVers.conf
2017-01-02 11:08:54 +01:00
DL6ER
677694b01a
Set 24h lease time if settings was empty before
2017-01-02 11:05:40 +01:00
DL6ER
85f0241c0d
Reprocess DHCP settings after update
2017-01-02 10:50:59 +01:00
DL6ER
ebf0db4bbf
Typo fixed
2016-12-31 17:17:46 +00:00
DL6ER
9ac265980f
Add .conf to filename
2016-12-31 13:41:19 +00:00
DL6ER
40798da6b1
Add blacklisting wildcard support
2016-12-31 12:49:04 +00:00
Dan Schaper
fc596e41d4
All scripts set executable
2016-12-30 18:35:16 -08:00
Mcat12
7bcc15e416
Adjust blocking page paths from admin restructure
2016-12-30 15:36:53 -05:00
DL6ER
1a3bdbaabf
Merge pull request #1057 from pi-hole/new/whitelistonblockingpage
...
Allow whitelisting from blocking page
2016-12-30 21:07:34 +01:00
Mcat12
5e35fdbc52
Save blocking page CSS to pihole directory instead of admin
2016-12-30 14:42:15 -05:00
Mcat12
ab2c486f25
Fix password Enter handling
...
Also remove extranious form information, since JS handles that
2016-12-30 14:13:15 -05:00
Mcat12
7fd7430d38
Use pi.hole when getting js and css
...
If a user is able to get to this page, they must be using Pi-hole
2016-12-30 13:43:29 -05:00
Mcat12
089b98430f
Fix formatting
2016-12-30 12:59:05 -05:00
DL6ER
5c7fc05a32
Enable DHCP logging by default
2016-12-30 16:31:57 +00:00
DL6ER
09bbc81470
Add notice that the user might have to flush his DNS cache
2016-12-30 12:27:33 +00:00
Dan Schaper
f7274addcd
Delete swapfile generator, haven't used this in a long time.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-30 04:08:32 -08:00
DL6ER
09bfa2ef77
Add whitelisting on blocking page feature
2016-12-30 12:03:45 +00:00
DL6ER
9181a4a1d8
Apply dhcp lease time also for IPv6
2016-12-29 14:26:23 +00:00
DL6ER
3268e1611a
Backend accept and apply dhcp lease time
2016-12-29 14:19:44 +00:00
DL6ER
cf724176dc
Do stateful DHCPv6 and SLAAC
2016-12-28 20:02:48 +00:00
DL6ER
1e627c7e8f
Make webpage.sh fully library style
2016-12-28 16:25:14 +00:00
DL6ER
9af26cbaac
Major simplification of webpage.sh
2016-12-28 02:14:47 +00:00
DL6ER
321ea8a3a9
Merge branch 'development' into webUIprivacymode
2016-12-27 21:27:11 +01:00
Dan Schaper
ef8292d371
Merge branch 'development' into updater_rewrite
2016-12-27 11:59:52 -08:00
Dan Schaper
c5f5252145
Merge pull request #961 from pi-hole/customblockpage
...
Custom Pi-Hole block page
2016-12-27 10:25:03 -08:00
Dan Schaper
62d001225a
Merge pull request #1040 from pi-hole/fix/updater_git-C
...
Remove git -C from update.sh
2016-12-25 12:28:42 -08:00
DL6ER
e50947eb58
mend
2016-12-25 21:26:06 +01:00
DL6ER
ca056d32d2
Remove git -C
2016-12-25 21:22:59 +01:00
DL6ER
a0e0465036
Revert "Merge pull request #1018 from pi-hole/diginc-patch-1"
...
This reverts commit ff3c36a7a29355a8ad0e
2016-12-25 17:32:59 +01:00
DL6ER
e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail()
2016-12-25 01:18:58 +01:00
DL6ER
5e28e6b9ac
Removed remaining git -C
2016-12-25 01:17:46 +01:00
Dan Schaper
3365ef7aaa
is_repo() returns values to caller, silence function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:54:04 -08:00
Dan Schaper
68c17b26dc
Bashisms
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:41:42 -08:00
Dan Schaper
e647efd471
Shell script, not javascript
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:24:20 -08:00
DL6ER
15db1ffdd5
Remove variables not needed any more
2016-12-24 15:48:43 +01:00
DL6ER
4632b0f797
Updated updater logic
2016-12-24 15:40:31 +01:00
DL6ER
65c35a5530
Use new subroutine to determine if updates are available
2016-12-24 15:32:25 +01:00
DL6ER
c449a1c0e0
Added GitCheckUpdateAvail()
2016-12-24 15:19:39 +01:00
DL6ER
b020010f0d
Removed some of the &> /dev/null
2016-12-24 15:08:30 +01:00
DL6ER
0276c72fe2
replace 'git -C' with long version (see #1009 )
2016-12-24 15:05:57 +01:00
DL6ER
04a9791be2
Save empty password
2016-12-23 23:41:40 +01:00
Adam Warner
c1982c04ff
Merge pull request #1029 from pi-hole/bogusDNS_BOGUS_PRIVentries
...
remove `DNS_BOGUS_PRIV` from setupVars.conf
2016-12-23 19:32:13 +00:00
Promofaux
9a62026830
remove DNS_BOGUS_PRIV from setupVars.conf
2016-12-23 19:27:02 +00:00
