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
Adam Warner