Dan Schaper
|
073c7e54df
|
Merge pull request #1331 from pi-hole/RemovePasswordFromDebugLogBecauseSomePeopleFeelItUnderminesSecurity-TheyProbablyHaveAPoint
add check on file_parse to not include WEBPASSWORD= in the debug log
|
7 years ago |
Dan Schaper
|
2834f2ccc2
|
Let `ip` determine which links are candidates.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
7 years ago |
georou
|
6c56665403
|
updated travis for new firewalld add service
|
7 years ago |
georou
|
0d794226ab
|
Removed unsupported POSIX brace expansion
|
7 years ago |
Wandmalfarbe
|
ab2af11775
|
Fixed minor spelling mistakes in README.md
|
7 years ago |
Adam Warner
|
83662c9e50
|
additional requested changes
|
7 years ago |
Adam Warner
|
6c1d52199f
|
Merge branch 'master' of https://github.com/jftuga/pi-hole into jftuga-master
|
7 years ago |
Adam Warner
|
cfaf1ac67c
|
add check on file_parse to not include WEBPASSWORD= in the debug log
|
7 years ago |
Mcat12
|
a6caa0e680
|
Merge pull request #1327 from pi-hole/fix/pihole-help-text
Fix help text bug
|
7 years ago |
Mcat12
|
c4b43f92ce
|
Fix help text bug
Fixes #1325
|
7 years ago |
DL6ER
|
3d1ccd9625
|
Merge pull request #1312 from pi-hole/pihole-backports
Pi-hole Core v2.13.2
|
7 years ago |
John Taylor
|
76bd53ef1f
|
replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO}
|
7 years ago |
Mcat12
|
8fa209f0df
|
Merge pull request #1322 from pi-hole/FixWildCardBlacklisting
Only remove from wildcard list if domain is being added to whitelist …
|
7 years ago |
Mcat12
|
88835512dd
|
Merge pull request #1322 from pi-hole/FixWildCardBlacklisting
Only remove from wildcard list if domain is being added to whitelist …
|
7 years ago |
Adam Warner
|
6b862dd9e9
|
Only remove from wildcard list if domain is being added to whitelist or blacklist
|
7 years ago |
DL6ER
|
be0b76c954
|
Merge pull request #1319 from pi-hole/fix/gravitypath
Use absolute path for pihole command in gravity.sh
|
7 years ago |
georou
|
e45559da20
|
Use Firewalld services instead of ports
|
7 years ago |
DL6ER
|
d7b5870ba6
|
Use absolute path for pihole command in gravity.sh. Fixes #1318
|
7 years ago |
Dan Schaper
|
df18c7cd59
|
Merge pull request #1313 from pi-hole/new/piholecheckout
Checkout adjustments
|
7 years ago |
Dan Schaper
|
2e74219ff9
|
Merge pull request #1313 from pi-hole/new/piholecheckout
Checkout adjustments
|
7 years ago |
Dan Schaper
|
b0ae954f1e
|
Only update when `update` flag is set to "true"
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
7 years ago |
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>
|
7 years ago |
DL6ER
|
38547ced7a
|
Can only diff once upstream branch is tracked
|
7 years ago |
DL6ER
|
9a9d9007cd
|
Add missing "== true"
|
7 years ago |
DL6ER
|
bd2d81f691
|
source setupVars.conf to see if INSTALL_WEB is true or not
|
7 years ago |
DL6ER
|
1b9e7fbf2e
|
Test if branch is locally available is not reliable because of possible ambiguities
|
7 years ago |
DL6ER
|
d4a49d192f
|
Correct variable name
|
7 years ago |
DL6ER
|
8cb66544d2
|
Remove "\ "
|
7 years ago |
DL6ER
|
140ac192aa
|
The web repo might actually be missing and this is n error (not installed because the user didn't want it)
|
7 years ago |
DL6ER
|
b961b13d60
|
Small bugfix
|
7 years ago |
DL6ER
|
febdb4a190
|
Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all)
|
7 years ago |
DL6ER
|
1d60b62e7a
|
Testing alternative way of fetching/checking out of a single branch
|
7 years ago |
Dan Schaper
|
41e1e4cb68
|
Rearrange pull logic, some optimization.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
7 years ago |
Dan Schaper
|
d5b88e0df8
|
Get the right name for the options.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
7 years ago |
Dan Schaper
|
20fd61468d
|
Require branch to check out
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
7 years ago |
Dan Schaper
|
0a0d25dff4
|
Script runs in subshell, no need to cd back to pwd.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
7 years ago |
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
|
7 years ago |
Dan Schaper
|
33f7979359
|
Merge pull request #1293 from pi-hole/fix/version
Account for hash in versioning
|
7 years ago |
Dan Schaper
|
8460b2544b
|
Merge pull request #1295 from pi-hole/tweak/pullapprove
Require 4 approvals instead of five for merging into master
|
7 years ago |
Dan Schaper
|
bc514ea955
|
Merge pull request #1296 from pi-hole/fix/debugVersion
Debug version detection improvements
|
7 years ago |
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
|
7 years ago |
DL6ER
|
de6aaf18ab
|
Merge pull request #1302 from pi-hole/fix/nowildcardlistfile
Check for existence of wildcard blocking list (query adlists)
|
7 years ago |
DL6ER
|
0fe64cf5cc
|
Merge pull request #1300 from pi-hole/fix/deletehostrecord
Bugfix for when deleting host-record
|
7 years ago |
DL6ER
|
9a95531fb9
|
Merge pull request #1310 from pi-hole/new/piholecheckout
Pi-hole checkout feature
|
7 years ago |
Mcat12
|
9df6a8dd06
|
Merge pull request #1311 from pi-hole/tweak/ascii-berry
add ascii berry to beginning of installer
|
7 years ago |
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
|
7 years ago |
Jacob Salmela
|
5e16487ef6
|
add ascii berry to beginning of installer
|
7 years ago |
DL6ER
|
2b3afbfef8
|
Merge pull request #1310 from pi-hole/new/piholecheckout
Pi-hole checkout feature
|
7 years ago |
Dan Schaper
|
c3c7dcc9f5
|
Merge remote-tracking branch 'origin/new/piholecheckout' into new/piholecheckout
|
7 years ago |
Dan Schaper
|
273728b481
|
One more argument to shift.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
7 years ago |