4ad0cdf5d4
Rewrite Chronometer to output more stats
2017-05-25 01:03:13 +10:00
1a87d3a659
add process check function
2017-05-23 22:57:22 -05:00
085f2c6ca0
add port check function
2017-05-23 22:32:30 -05:00
b74300f67c
add ping internet function and fix some spacing issues
2017-05-22 12:57:55 -05:00
107babe8f4
add ping gateway function
2017-05-22 12:35:57 -05:00
8fd9a22d18
add detect IP function
2017-05-22 12:05:42 -05:00
8c5c1316dd
add php version and processor check functions
2017-05-22 08:48:56 -05:00
daff5d8b5a
add critical dependencies version check functions
2017-05-22 03:05:51 -05:00
6c4a7b626e
add pihole version check functions
2017-05-22 02:39:00 -05:00
1aa5943e67
add if directory exists function
2017-05-22 01:06:15 -05:00
69fe889f92
comments for all lines and small formatting changes
2017-05-21 23:25:53 -05:00
5d7ef9281f
get just the OS pretty name for Dan
2017-05-20 02:01:56 -05:00
6fa00e7cc8
first functions with pretty colors. check OS, setupVars, and contents of .d dirs
2017-05-20 01:34:13 -05:00
69fa9874dd
Use HTTP_HOST instead of SERVER_NAME
...
* Fixes https://github.com/pi-hole/pi-hole/issues/1479
2017-05-18 18:54:26 +10:00
f6732a484e
Merge pull request #1317 from r0ckarong/development
...
Fixed handling of `pihole -wild` help text
2017-05-18 11:16:25 +10:00
42eb811910
Add "quiet" mode + update comments in the cron file
2017-05-17 12:54:43 +02:00
c9042ffedd
Print echos only when manual flushing is requested
2017-05-17 12:51:04 +02:00
4e2c6a7b8e
Fix logrotation: manual flushing should be done twice, but automated rotation at midnight should only be done *once*!
2017-05-17 12:44:35 +02:00
7453bf2ee6
Fix wildcard help text
...
* -wild is not a valid option since we're already using -wild
2017-05-16 10:23:53 +10:00
7d17c652f3
Merge branch 'development' into development
2017-05-16 10:18:32 +10:00
90119c75d5
more merge conflicts!
2017-05-14 16:43:20 +01:00
30035ce1c2
Merge branch 'development' into tweak/help-output
2017-05-14 13:03:33 +10:00
3bd677c102
Show help for "pihole -v -h"
...
* Indent output text
* Minor help text change
2017-05-14 11:57:46 +10:00
0e4473685b
Show help for "pihole -a -i --help"
2017-05-14 11:47:56 +10:00
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
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
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
f9d41caeb6
Merge branch 'development' into blockpage2
2017-05-13 23:29:44 +10:00
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
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
5bb91759b4
Merge pull request #1459 from WaLLy3K/patch-2
...
Provide remote hashes for version.sh
2017-05-12 12:38:13 -07:00
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
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
f875976268
Replacing superseded file with dummy content
2017-05-11 21:02:04 +10:00
1c2aa44d46
Provide notice message for whitelisted sites
2017-05-11 20:10:40 +10:00
3b44a0da32
Provide error message if not found in any list
2017-05-11 20:09:00 +10:00
501b26decd
Log and echo gateway responses
2017-05-10 22:08:06 -07:00
c6596f2c54
Modified syntax to be valid for Shellcheck
2017-05-11 14:19:13 +10:00
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
7fef1fdc83
Fixed indentation
2017-05-11 10:11:04 +10:00
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
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
173ad339bb
Update CSS location
2017-05-08 19:33:45 +10:00
9beb9fd941
Merge pull request #1384 from pi-hole/checkoutImprovements
...
Stash changes when switching branches
2017-05-05 23:22:54 +01:00
9cc392fa02
Update Marks PR after the Promo code has been merged
2017-05-04 11:43:48 +02:00
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
f2016f26d7
Updated splash page CSS href
2017-05-03 15:29:43 +10:00
9c136a5579
functionise Hashing
2017-05-02 22:24:37 +01:00
a8818c16d8
Fixed unnecessary usage of !important
2017-05-02 19:51:13 +10:00
7bcea98d0c
Do not activate letsencrypt.conf if found
2017-05-02 17:28:51 +10:00
74b15d10d9
Update lighttpd.conf.fedora
...
Mirror changes found in `lighttpd.conf.debian`
2017-05-02 17:24:55 +10:00
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
dfb5c37d98
Delete index.js
2017-05-02 17:21:40 +10:00
30dcf6ff47
Include pihole-FTL.log in debug report
2017-05-02 09:18:58 +02:00
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
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
19e688effb
Add localise-queries flag to 01-pihole.conf
2017-04-30 13:47:07 +02:00
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
db1e5f10ea
Make changes according to comment in #1384
2017-04-21 17:08:15 +02:00
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
320c06e0a4
Flush twice to move data out-of-sight of FTL
2017-04-17 21:25:15 +02:00
2e398c5da4
stash changes on branch switch, else it fails if any changes have been made.
2017-04-14 17:20:13 +01:00
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
3eacfa9831
Improve FTL's service script
2017-04-12 14:13:18 +02:00
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
a96b4d28e1
Merge pull request #1365 from pi-hole/adlistImprovements
...
Adlist improvements
2017-04-06 16:15:50 -04:00
57e8b7f924
Merge pull request #1355 from pmo3/development
...
Mask password input when changing password
2017-04-03 20:23:19 -04:00
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
ad9575ce18
Recognize more host names
2017-04-03 16:28:18 +02:00
3cf9942465
spacing fixed
2017-03-31 23:00:56 +01:00
153031482f
Add delete mode to adlist command. Might be abetter way to do this
2017-03-31 22:51:10 +01:00
af2cff5177
remove call to user list
2017-03-31 20:13:04 +01:00
5435b93df2
remove spaces
2017-03-31 20:05:45 +01:00
3a3dde6298
add adlist argument redirector
2017-03-31 20:03:56 +01:00
b4bc90fb85
add in CustomizeAdlists function
2017-03-31 19:35:52 +01:00
f09c166350
Improve Error 404 page behavior
2017-03-28 14:02:00 +02:00
24868fdb2b
Merge remote-tracking branch 'upstream/development' into development
2017-03-27 13:38:19 -04:00
a463250ecf
don't hash an empty password
2017-03-27 13:37:19 -04:00
6eb9192cd1
Complete site
...
The start <html>-tag was missing.
2017-03-25 16:11:37 +01:00
94f15f1b3c
Merge remote-tracking branch 'upstream/development' into development
2017-03-23 18:47:50 -04:00
ee296f36c1
mask password input on command line
2017-03-23 18:47:30 -04:00
fb3e6ee35c
Source setupVars before attempting to use it
...
Fixes #1347
2017-03-21 18:01:51 -04:00
2740c68a63
Merge pull request #1335 from pi-hole/tweak/debug_templog
...
Debugging tweaks for temporary logfiles
2017-03-16 23:35:15 -07:00
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
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
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
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
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
cfaf1ac67c
add check on file_parse to not include WEBPASSWORD= in the debug log
2017-03-15 18:59:41 +00:00
6b862dd9e9
Only remove from wildcard list if domain is being added to whitelist or blacklist
2017-03-13 20:38:34 +00:00
bb7a7d94ef
Replace misleading letter variable
2017-03-12 16:16:45 +01:00
9a475cc010
Rewrite help text for better handling of params
2017-03-12 15:50:48 +01:00
ae30c285a2
Fix handling of wildcard help text
2017-03-12 15:45:11 +01:00
2e74219ff9
Merge pull request #1313 from pi-hole/new/piholecheckout
...
Checkout adjustments
2017-03-11 13:01:11 -08:00
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
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
38547ced7a
Can only diff once upstream branch is tracked
2017-03-11 16:55:37 +01:00
9a9d9007cd
Add missing "== true"
2017-03-11 16:49:47 +01:00
bd2d81f691
source setupVars.conf to see if INSTALL_WEB is true or not
2017-03-11 16:46:52 +01:00
1b9e7fbf2e
Test if branch is locally available is not reliable because of possible ambiguities
2017-03-11 16:40:10 +01:00
d4a49d192f
Correct variable name
2017-03-11 16:38:28 +01:00
8cb66544d2
Remove "\ "
2017-03-11 16:36:54 +01:00
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
b961b13d60
Small bugfix
2017-03-11 16:27:00 +01:00
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
1d60b62e7a
Testing alternative way of fetching/checking out of a single branch
2017-03-11 16:11:23 +01:00
41e1e4cb68
Rearrange pull logic, some optimization.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 11:25:35 -08:00
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
20fd61468d
Require branch to check out
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 11:04:37 -08:00
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
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
2b3afbfef8
Merge pull request #1310 from pi-hole/new/piholecheckout
...
Pi-hole checkout feature
2017-03-09 00:43:35 +01:00
81a1057cac
Fix something Dan has overlooked
2017-03-09 00:30:36 +01:00
fd310c6445
Back to how we had it before, because --unshallow does not work at all
2017-03-09 00:28:02 +01:00
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
87da40068c
Always `exit`ed 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
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
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
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
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
d2ab0694b7
Add "master" shortcut
2017-03-08 13:18:34 +01:00
8a14a63d5d
Pi-hole checkout feature
2017-03-08 13:16:40 +01:00
8235b18854
Remove duplicated line
2017-03-08 12:09:34 +01:00
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
10bc8414b9
Move FTL querying before clearing the terminal to avoid flashing on Pi B+
2017-03-07 18:10:05 +01:00
4e25e0dc5c
Add missing } to JSON output
2017-03-07 17:57:57 +01:00
b1a9793d94
Let Chronometer query all data from FTL (no need for having the API). Fixes #1305
2017-03-07 17:54:11 +01:00
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
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
cf31561267
Remove wildcard entry when adding the very same domain either the white- or blacklist
2017-03-06 16:25:35 +01:00
a97f0b1298
Merge pull request #1300 from pi-hole/fix/deletehostrecord
...
Bugfix for when deleting host-record
2017-03-06 16:16:42 +01:00
d1e0f3ae18
Merge pull request #1294 from pi-hole/tweak/debugDNS
...
Tweak DNS debugging
2017-03-06 05:50:37 -08:00
47a6786e8f
Use proper test syntax
2017-03-06 14:02:56 +01:00
a69fcbb91e
Bugfix for when deleting host-record
2017-03-06 13:44:13 +01:00
8e2b51b391
Merge pull request #1296 from pi-hole/fix/debugVersion
...
Debug version detection improvements
2017-03-05 07:13:41 -08:00
560af43204
Merge pull request #1293 from pi-hole/fix/version
...
Account for hash in versioning
2017-03-05 07:10:18 -08:00
baefec86f2
Add CLI teleporter feature
2017-03-05 14:08:44 +01:00
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
512c650441
Shellchecking.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 19:07:55 -08:00
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
6f2fb57c08
Protocol specific records checks.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 15:16:33 -08:00
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
9f4ef66f41
Add IPv6 resolver test
2017-03-04 22:38:52 +01:00
086f0790fc
Add Google's IPv6 address for potential IPv6 resolver tests
2017-03-04 22:31:18 +01:00
709b44f736
IPv4 DNS tests
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 12:16:43 -08:00
6cd4ff6d68
Organize functions and function calls.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 12:16:32 -08:00
abd3e828de
Optimize normalOutput
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 07:46:00 -08:00
b85af50d14
Generate only the information that is actually asked for
2017-03-04 14:08:11 +01:00
0e8fd49669
Function...
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 23:30:57 -08:00
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
77ab47a984
Awk for perl
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 22:34:55 -08:00
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
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
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
9bb4a5fb25
Factor out variables from display.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 20:16:53 -08:00
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
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
f2fe84c9d3
Merge pull request #1292 from pi-hole/master
...
Merge patches back into devel
2017-03-03 23:45:29 +01:00
f626406685
Revert #1273
2017-03-03 23:14:12 +01:00
dd971b6ee5
Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)
2017-03-03 22:58:41 +01:00
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
66b7d04b82
Merge branch 'development' into new/FTL-binary
2017-03-01 12:42:48 +01:00
7ba47f504c
Add special "except-interface" line in case of listening on all interfaces
2017-03-01 12:15:04 +01:00
0be1717ff4
Fix config error
2017-03-01 11:46:48 +01:00
189a4e0078
Add option to skip restarting of dnsmasq
2017-03-01 11:26:06 +01:00
3adf8785d8
Move "all" down in help text to not suggest that it is the default
2017-03-01 11:07:05 +01:00
b74862bfc5
Actually apply new setting by restarting dnsmasq
2017-03-01 11:02:08 +01:00
01273124ea
Change to -i, interface
2017-03-01 10:59:55 +01:00
721ada7e16
Fix typo
2017-03-01 10:52:21 +01:00
bd9dc91396
Add response for users manually setting this up via CLI
2017-03-01 10:50:13 +01:00
de6c43a8d3
Setup interface listening behavior of dnsmasq
2017-03-01 10:46:20 +01:00
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
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
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
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
9b060aab34
Debug auto mode engaged
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-26 18:22:06 -08:00
ec7e75a6e3
Don't save `interface=` line to `dnsmasq`s config file
2017-02-24 16:02:24 +01:00
ce6c465942
Merge pull request #1266 from pi-hole/new/host-record
...
Add host-record option
2017-02-23 17:32:10 +01:00
7a1a2dec67
update license to EUPL on core files
2017-02-22 11:55:20 -06:00
7ed1bbad49
Add host-record option
2017-02-22 14:43:07 +01:00
078cc7660e
Improved updater logic
2017-02-22 11:00:45 +01:00
af2893d2ce
Updater implementation for FTL
2017-02-22 10:43:13 +01:00
fb6631d317
Removed a line that did nothing.
2017-02-21 22:22:30 +01:00
cd0b8927c5
Removed a line that did nothing.
2017-02-21 22:22:03 +01:00
3fab34687c
Redirect pi.hole to pi.hole/admin/
2017-02-21 20:38:09 +01:00
b2d78edae9
Redirect pi.hole to pi.hole/admin/
2017-02-21 20:36:59 +01:00
a64211123f
Some debug additions
2017-02-21 16:46:54 +01:00
4f85ace525
Force pihole user to use sh-shell (instead of nologin)
2017-02-21 14:46:53 +01:00
e8fde702a0
Also chown the other files
2017-02-21 11:52:07 +01:00
e339f3852c
Change ownership of FTL log to pihole user
2017-02-21 11:50:08 +01:00
032f94afc0
Don't suppress su's output
2017-02-21 11:46:31 +01:00
90ccbef431
pihole-FTL init.d script
2017-02-21 11:18:47 +01:00
a7def771c8
Revert "redirect pi.hole to pi.hole/admin"
2017-02-19 20:12:32 +00:00
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
053b38e0bd
Set up for IP matching in detection.
2017-02-16 19:45:44 -08:00
2aa3a109a0
Ping gateways and Internet.
2017-02-16 18:38:05 -08:00
472708376d
Split out IP checks.
2017-02-16 18:30:15 -08:00
cfed3d59e9
Begin fixing IP detection functions.
2017-02-16 16:49:14 -08:00
26cb6a1929
redirect pi.hole to pi.hole/admin
2017-02-11 20:46:27 -06:00
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
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
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
99fab7e52a
Scan whole dnsmasq.d directory for cofigurations files
2017-02-10 17:42:37 +01:00
ba67144e34
Merge branch 'development' into adminPageAsOption
2017-02-09 16:27:07 -05:00
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
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
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
01f643e5eb
fixup! Fix spacing for wildcard help in list script
2017-02-08 12:56:28 +01:00
8037f3e332
Fix spacing for wildcard help in list script
2017-02-08 12:55:14 +01:00
afe5176e01
Justify help output to match main script
2017-02-08 12:41:53 +01:00
a48317883d
Fix indentation
2017-02-07 18:14:41 -05:00
4fcf8fd23f
Merge in `development` branch - resolve conflict in update.sh
2017-02-05 19:39:02 +00:00
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
b764d17c64
comment
2017-02-05 19:18:27 +00:00
ba0abdb88d
wrap update logic in admin_installed bool check
2017-02-05 19:12:09 +00:00
1428b58dde
source setupVars and only check admin repo if it is enabled
2017-02-05 19:07:04 +00:00
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
3239c7023a
Merge pull request #1170 from pi-hole/new/DHCPstaticleases
...
Backend changes for static DHCP leases
2017-01-31 21:07:36 +01:00
da05491992
Merge pull request #1192 from pi-hole/fix/regex
...
Remove misplaced start of string expression
2017-01-30 21:25:45 +01:00
3d4516dc95
Improve regex
2017-01-29 20:27:20 +01:00
509c864cc3
Merge branch 'development' into fix/regex
2017-01-29 20:27:04 +01:00
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
f8944177a0
Fix chronometer interpreting summaryRaw
2017-01-29 13:32:48 -05:00
06873fe69e
Remove misplaced start of string expression. Fixes #1191
2017-01-29 13:54:39 +01:00
3d9d13222b
Use constants for leading paths.
2017-01-28 17:42:55 -08:00
745adabb05
Path to source basic-install.sh
2017-01-28 17:38:14 -08:00
3861b57dc6
Start moving reused utility functions to one script.
2017-01-28 17:32:42 -08:00
99a4a80017
Spelling
2017-01-28 17:08:38 -08:00
033ba26041
Stay in repo directory until we error check
2017-01-28 20:00:02 -05:00
08cddba200
There should be no echo here
2017-01-28 21:49:31 +01:00
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
85b3fef08d
Use perl instead of grep?
2017-01-28 00:39:10 +01:00
15037fa888
Typo
2017-01-28 00:17:32 +01:00
d595fef18f
Fix regex
2017-01-28 00:15:06 +01:00
be5fa22b6f
Merge pull request #1174 from pi-hole/tweak/logrotate_insecure_directory
...
Improve logrotate support
2017-01-27 11:18:06 -08:00
6fd7e0311c
Install customized version of logrotate script
2017-01-27 14:16:24 +01:00
1bcf2dd0fc
Tweak CLI domain filter
2017-01-27 00:45:57 +01:00
dad18dc5de
Changed keywords
2017-01-25 10:35:45 +01:00
5c95c4074b
Remove static leases from DHCP static leases file
2017-01-25 10:35:03 +01:00
4301b9a12a
Add static DHCP leases to new file
2017-01-25 10:33:25 +01:00
6a89c6bf3b
Silence rm warning if no DHCP server is used
2017-01-23 15:06:36 +01:00
fe8c365d17
codacy never lies
2017-01-22 20:53:30 +00:00
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
1ad23a065e
switch out `wc -l` with `grep -c ^`
2017-01-22 20:38:46 +00:00
de102fde5c
Add line count and size check for pihole.log
2017-01-22 20:38:09 +00:00
8bb9dd460b
Be able to disable the DHCP domain name
2017-01-18 12:22:03 +01:00
58f3ff69d8
Align comment with referenced line
2017-01-16 18:51:13 -05:00
72d8d10e64
Show most recently blocked domain in chronometer (using FTL). Fixes #717
2017-01-16 22:39:58 +01:00
63d02df0bc
Merge pull request #1130 from pi-hole/new/logrotate
...
Use logrotate for pihole.log
2017-01-16 15:11:11 -05:00
08f08fea61
Merge pull request #1135 from pi-hole/new/multipleDNSservers
...
Allow multiple DNS servers
2017-01-13 23:48:38 +01:00
WaLLy3K
Jacob Salmela
DL6ER
Adam Warner
Dan Schaper
Adam Hill
Hans Geiblinger
0412465564
Adam Warner
gedetil
Mcat12
Flo
Patrick O'Brien
Dan Schaper
Markus Napp
raincoats
DL6ER
ProtoFoo
Dan Schaper
Jacob Salmela