ainur/pi-hole
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
2,473 Commits 10 Branches 126 Tags
42eb811910ddb2fcd4a39a1a49b922686126ebce
Commit Graph

717 Commits

Author SHA1 Message Date
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
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