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 |
|
DL6ER
|
be0b76c954
|
Merge pull request #1319 from pi-hole/fix/gravitypath
Use absolute path for pihole command in gravity.sh
|
2017-03-13 21:16:31 +01:00 |
|
georou
|
e45559da20
|
Use Firewalld services instead of ports
|
2017-03-14 01:13:23 +11:00 |
|
DL6ER
|
d7b5870ba6
|
Use absolute path for pihole command in gravity.sh. Fixes #1318
|
2017-03-12 23:15:23 +01: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
|
df18c7cd59
|
Merge pull request #1313 from pi-hole/new/piholecheckout
Checkout adjustments
|
2017-03-11 22:54:57 +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 |
|
DL6ER
|
38ba079baa
|
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-10 14:33:12 +01:00 |
|
Dan Schaper
|
33f7979359
|
Merge pull request #1293 from pi-hole/fix/version
Account for hash in versioning
|
2017-03-10 14:32:52 +01:00 |
|
Dan Schaper
|
8460b2544b
|
Merge pull request #1295 from pi-hole/tweak/pullapprove
Require 4 approvals instead of five for merging into master
|
2017-03-10 14:31:53 +01:00 |
|
Dan Schaper
|
bc514ea955
|
Merge pull request #1296 from pi-hole/fix/debugVersion
Debug version detection improvements
|
2017-03-10 14:30:50 +01:00 |
|
DL6ER
|
6f8893d950
|
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-10 14:29:38 +01:00 |
|
DL6ER
|
de6aaf18ab
|
Merge pull request #1302 from pi-hole/fix/nowildcardlistfile
Check for existence of wildcard blocking list (query adlists)
|
2017-03-10 14:29:13 +01:00 |
|
DL6ER
|
0fe64cf5cc
|
Merge pull request #1300 from pi-hole/fix/deletehostrecord
Bugfix for when deleting host-record
|
2017-03-10 14:28:52 +01:00 |
|
DL6ER
|
9a95531fb9
|
Merge pull request #1310 from pi-hole/new/piholecheckout
Pi-hole checkout feature
|
2017-03-10 14:24:15 +01:00 |
|
Mcat12
|
9df6a8dd06
|
Merge pull request #1311 from pi-hole/tweak/ascii-berry
add ascii berry to beginning of installer
|
2017-03-09 13:40:57 -05: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 |
|
Jacob Salmela
|
5e16487ef6
|
add ascii berry to beginning of installer
|
2017-03-08 21:14:21 -06:00 |
|
DL6ER
|
2b3afbfef8
|
Merge pull request #1310 from pi-hole/new/piholecheckout
Pi-hole checkout feature
|
2017-03-09 00:43:35 +01:00 |
|
Dan Schaper
|
c3c7dcc9f5
|
Merge remote-tracking branch 'origin/new/piholecheckout' into new/piholecheckout
|
2017-03-08 15:32:14 -08:00 |
|
Dan Schaper
|
273728b481
|
One more argument to shift.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-08 15:32:06 -08: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
|
708067e875
|
Merge pull request #1309 from pi-hole/new/FTLChronometer
Remove duplicated line
|
2017-03-08 13:27:11 +01: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 |
|