DL6ER
a0e0465036
Revert "Merge pull request #1018 from pi-hole/diginc-patch-1"
...
This reverts commit ff3c36a7a2
, reversing
changes made to 9355a8ad0e
.
8 years ago
DL6ER
e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail()
8 years ago
DL6ER
5e28e6b9ac
Removed remaining git -C
8 years ago
Dan Schaper
3365ef7aaa
`is_repo()` returns values to caller, silence function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
68c17b26dc
Bashisms
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
e647efd471
Shell script, not javascript
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
15db1ffdd5
Remove variables not needed any more
8 years ago
DL6ER
4632b0f797
Updated updater logic
8 years ago
DL6ER
65c35a5530
Use new subroutine to determine if updates are available
8 years ago
DL6ER
c449a1c0e0
Added GitCheckUpdateAvail()
8 years ago
DL6ER
b020010f0d
Removed some of the &> /dev/null
8 years ago
DL6ER
0276c72fe2
replace 'git -C' with long version (see #1009 )
8 years ago
DL6ER
04a9791be2
Save empty password
8 years ago
Adam Warner
c1982c04ff
Merge pull request #1029 from pi-hole/bogusDNS_BOGUS_PRIVentries
...
remove `DNS_BOGUS_PRIV` from setupVars.conf
8 years ago
Promofaux
9a62026830
remove `DNS_BOGUS_PRIV` from setupVars.conf
8 years ago
bcambl
2fb0dc0a4a
add warning if SELinux is Enforcing
8 years ago
Adam Warner
ef1ce66793
Merge pull request #1013 from pi-hole/fix/chronometer
...
Fix chronometer.sh
8 years ago
Adam Warner
3bc5d1bae0
Merge pull request #989 from pi-hole/APIresolveclientsandupstream
...
Implement backend for AdminLTE/#253
8 years ago
Adam Warner
ff3c36a7a2
Merge pull request #1018 from pi-hole/diginc-patch-1
...
pihole.cron reduce duplication
8 years ago
Adam Hill
5e53f484be
Update pihole.cron
...
Stop repeating the path.
8 years ago
DL6ER
bb28d94884
Merge branch 'development' into customblockpage
...
Conflicts:
automated install/basic-install.sh
8 years ago
DL6ER
a4f58b0a22
Look for "query[" instead of "query" to avoid false-positives, like listed below
...
root@raspberrypi:/etc/.pihole# grep 'query' /var/log/pihole.log | grep -v 'query\['
Dec 22 16:29:50 dnsmasq[30801]: forwarded code.jquery.com to 208.67.222.222
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.com is <CNAME>
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 94.31.29.54
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 23.111.11.3
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 198.232.125.113
8 years ago
DL6ER
bcf8139708
Removed cat where we don't need it
8 years ago
DL6ER
9b0390c9da
Space to Tab
8 years ago
DL6ER
e88f58c34e
Remove grpping for today's log entries, because we flush the log every day
8 years ago
DL6ER
4626b8ced5
Removed fixed username from sudoers file
8 years ago
DL6ER
ee8f29d178
Fixed typo, extended help text
8 years ago
DL6ER
da363070c7
Added Kelvin
8 years ago
DL6ER
715838cf89
Allow disabling second DNS server
8 years ago
DL6ER
7a243f890e
Backend for privacyMode on webUI
8 years ago
DL6ER
afabb5957b
Implement backend for https://github.com/pi-hole/AdminLTE/pull/253
8 years ago
Mcat12
a0019d86c5
Merge pull request #983 from pi-hole/cronpath
...
Fix missing path information for cron
8 years ago
DL6ER
3c4a9bba78
Minor change
8 years ago
Adam Warner
4348653431
Merge pull request #985 from pi-hole/pi.hole
...
A man has no name. Even though his name is Jaqen H'ghar
8 years ago
Promofaux
e7713a9028
add missing pihole autocomplete commands
8 years ago
Promofaux
684ac98c8e
Remove hostname and pi.hole entries, move to /etc/pihole/local.list
8 years ago
DL6ER
9a2ffabc33
Fix missing path information
8 years ago
DL6ER
2977168da1
dnsmasq "bogus-priv" property
8 years ago
DL6ER
85e3f37503
dnsmasq "domain-needed" property
8 years ago
DL6ER
ba015c1918
Set domain name via Settings page
8 years ago
DL6ER
1556adb678
Also remove quiet-dhcp setting when disabling/enabling the Pi-Hole DHCP server
8 years ago
Adam Warner
6bfe729112
Merge pull request #979 from pi-hole/wwwdatapassword
...
Prevent web UI password change by web user
8 years ago
DL6ER
207422f83a
Added a missing space
8 years ago
DL6ER
004ba28378
Prevent web UI password change by web user
8 years ago
DL6ER
6f38801ed8
Add "Interface appearence" option
8 years ago
DL6ER
b8d2bfc890
Wait 5 seconds before rebooting so the web UI can finish loading before being unreachable due to the reboot
8 years ago
DL6ER
bc91716082
Suppress logging of DHCP actions to /var/log/pihole.log
8 years ago
DL6ER
8dc0dc4d69
Add DHCP-Server backend
8 years ago
DL6ER
2f4b7ce3dd
Update dnsmasq file when changing upstream DNS servers and restart the service to get it active
8 years ago
DL6ER
d4f83cb1d4
Be able to set API_QUERY_LOG_SHOW
8 years ago
DL6ER
aaab3306a8
Add restart DNS capability
8 years ago
DL6ER
2bafa2f2ac
Add reboot option
8 years ago
DL6ER
9ac378ae09
Set domains and clients which are excluded by the API
8 years ago
DL6ER
bf867bd9fd
Set DNS servers from web UI
8 years ago
DL6ER
505c9e8979
Minor change
8 years ago
DL6ER
75deb02961
Don't query pihole if page is hidden anyhow
8 years ago
DL6ER
480211033d
Detect if blocking page is loaded within frame or iframe. If so, hide everything
8 years ago
DL6ER
ca9321624c
Added padding for ad list results
8 years ago
DL6ER
40f18df90f
Simplified CSS, removed external contents
8 years ago
DL6ER
0d63cfd6c3
Add 1x1 pixel GIF image. Can apparently be used to trick some of the please-don't-use-adblocker pages as many of them contain code like `if ($('Ad').height() == 0) { prevent access to this page; }`
8 years ago
DL6ER
3d6b22de6c
Update index.php to include more detailed output
8 years ago
DL6ER
fc233fcdd3
Fixed typo
8 years ago
DL6ER
20370d4348
Update CSS file
8 years ago
DL6ER
0f90671241
Updated index.php to use CSS file unter admin/
8 years ago
DL6ER
a866c4e388
Place blockingpage.css (former index.css) unter admin/ so we can load it also from some blocked sub-directories
8 years ago
DL6ER
e7241a989c
Include CSS file
8 years ago
DL6ER
6e788668f9
Updated index.php
8 years ago
DL6ER
b246dba7e7
Rename index.html to index.php
8 years ago
Mcat12
f98de3d5db
Merge pull request #941 from DL6ER/caseinsensitive
...
Improvements for black-/whitelist scripts
8 years ago
DL6ER
78cb43d0dc
Revert "Simplified EscapeRegexp()"
...
This reverts commit 509cfd15f2
.
8 years ago
DL6ER
509cfd15f2
Simplified EscapeRegexp()
8 years ago
DL6ER
2061daa902
Don't forget to escape also the slash "/"
8 years ago
DL6ER
629ca970a1
Changed from single quoted filter expression to double quotes as reqeusted by codacy
8 years ago
DL6ER
c8ad6f23a8
Properly escape any special characters before using them in regexp manner
8 years ago
Dan Schaper
925c80edd4
Catch more 1's
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
2ec4acfe52
Begin fixing exit values.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
7b26b308ad
No need for echo and pipe here!
8 years ago
DL6ER
4c10634d85
Convert domain names to lower case before checking validity of the domain
8 years ago
Adam Warner
de4401823e
Merge pull request #924 from DL6ER/webpage.sh
...
Add webpage.sh
8 years ago
DL6ER
f50cbe74cb
Changed -web (webpage) to -a (admin)
8 years ago
DL6ER
33b6fe72da
Extended help text
8 years ago
DL6ER
733919be4a
Implement possibility to remove password using "pihole -web -p"
8 years ago
Dan Schaper
68cb0782c0
Add countdown timer
8 years ago
Dan Schaper
0f4c8d4923
Set default timeout to 60 seconds
8 years ago
Dan Schaper
6d2c5b2312
Add debug timeoute
8 years ago
Dan Schaper
a95ce11ca6
Add debug timeoute
8 years ago
DL6ER
88c161769d
Capitalized variable names.
8 years ago
DL6ER
01bf1ae92d
Compute double hashes to avoid rainbow table vulnerability
8 years ago
DL6ER
9193c71cff
Minor change
8 years ago
DL6ER
db278d81e4
Added webpage.sh
8 years ago
Adam Warner
b191cd73a7
Update piholeDebug.sh
...
wording
8 years ago
Jacob Salmela
ca56ca5bd8
promo-tweak
...
Better logic introduced by @PromoFaux
8 years ago
Jacob Salmela
a0f0dff88e
replace hardcoded interface with var
...
setupVars.conf is already sourced, so we just need to replace the
hardcoded value with the variable name.
8 years ago
Dan Schaper
8c08e9e473
Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count
...
Bugfix/chronometer domain count
8 years ago
Adam Warner
4300759287
Fix logic. If both v6 and v4 divide by two, else dont.
8 years ago
Promofaux
d7d6d6f991
Update to use new Var name
8 years ago
Promofaux
2f976504e8
switch out -eq for ==
8 years ago
Dan Schaper
4b7b859db9
Gotta catch 'em all...'
8 years ago
Dan Schaper
f7d0de53bb
Compare string to string.
8 years ago
Dan Schaper
603ec997ba
Remove testing block.
8 years ago
Dan Schaper
f7266ef4c8
Version remote check returns -1 on failure to detect curl silent failing. Update detects loss of contact to GitHub or fallthrough condition and reports to user.
8 years ago
Dan Schaper
3d43e1568c
Use explicit calls for function to self-document
8 years ago
Dan Schaper
c1a3f003e8
Rename the only utilty function left that didn't say `repo`
8 years ago
Dan Schaper
3f61aea7fc
Utility functions fully quiet now. Calling functions have the echos.
8 years ago
Dan Schaper
bd68db51e0
ShellCheck split local declaration and assignment.
8 years ago
Dan Schaper
b8a5ed710e
Take echos out of utility functions and move up a level.
8 years ago
Dan Schaper
34be601dd7
Test for lexicographically less than tag version.
8 years ago
Dan Schaper
1d64ad1ccd
Stash all changed files, clean directory and pull updates.
8 years ago
Dan Schaper
f2d7a3d26d
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Adam Warner
ee37c37cab
fix update output logic. version number variables should not be read only!
8 years ago
Dan Schaper
b636c1e1f8
Whitespace.
8 years ago
Dan Schaper
8b9f0487c0
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
...
# Conflicts:
# advanced/Scripts/update.sh
# automated install/basic-install.sh
8 years ago
Dan Schaper
ece1667fb0
Refactor and move some bits.
8 years ago
Adam Warner
50bd8b4a09
Further tweaks to local repo handling
8 years ago
Dan Schaper
93d91353a1
All tabs now spaced
8 years ago
Dan Schaper
8dc9143b34
Just delete, no need to cd there first.
8 years ago
Dan Schaper
a0d9a1133c
Factoring and combining functions
8 years ago
Dan Schaper
035e4bf727
Move value checks to `if` calls.
8 years ago
Dan Schaper
9ec5bbd560
Actually get `is_repo` to return a value and have it expected.
8 years ago
Dan Schaper
34482c5ed6
Modified `is_repo`
8 years ago
Dan Schaper
7d414b5628
Move version messages to main function, check for repos.
8 years ago
Dan Schaper
d9528dfd09
Bash is funny with returns.
8 years ago
Dan Schaper
9c83825cb8
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Dan Schaper
7a22471787
New naming convention, and reorder functions as bash would prefer them to be.
8 years ago
diginc
c30478bf4a
cleanup and use sentintel in is_repo
8 years ago
diginc
d986746ef9
missing quote added
8 years ago
diginc
a8fa061f2e
quote all the assignments prevent accidental glob splitting
8 years ago
Jacob Salmela
f8e9726922
source setupVars and check for the correct variable
8 years ago
Jacob Salmela
884363bd05
remove ipv6 check since it's already in setupVars
8 years ago
Dan Schaper
bdd240ecb6
Shellcheck catch for always true expansion.
8 years ago
Dan Schaper
04da292df9
Missed one spinner, updated and exit script if github is unreachable.
8 years ago
Dan Schaper
85b8676b8e
Remove spinner, no functions here should last that long, and it masks a few potential exit avenues.
8 years ago
Dan Schaper
114bc13c23
Specify path, cron may not know where the files are located.
8 years ago
Dan Schaper
5fef5f1ed4
Break down `is_repo` to make sure it does what is expected.
8 years ago
Dan Schaper
807b60b0e6
Missed the second reinstaller....
8 years ago
Dan Schaper
fbc800e556
If unattened reinstall fails, notify user and exit script immediately.
8 years ago
Dan Schaper
1991ee7a7d
Google Style Guide. `readonly` and cap constants.
8 years ago
Dan Schaper
ffbfadbccf
Detail what the script does.
8 years ago
Dan Schaper
c3e2bce956
Variables declared as strings, make sure they are strings when we use them in functions.
8 years ago
Dan Schaper
0c9520d7e3
Protect against unexepcted return values (GitHub not responding as we'd expect.) And make sure bash doesn't maul the variables and cause firing of unattended reinstall of application when values returned aren't as expected.
8 years ago
Dan Schaper
1e7e5230cc
Clarify what exactly is being called and the expected returned value format
8 years ago
Dan Schaper
f1efc97357
Clairfy condition to make sure they operate as per the specs of the logic flow layout.
8 years ago
Adam Warner
d6fe48112c
Merge pull request #857 from pi-hole/feature/debugUpdate
...
Debug Updates
8 years ago
Dan Schaper
dcf6e6b14d
Clarify user action required to end the scripts.
8 years ago
Dan Schaper
908697a963
User token instructions, and small bugfix for missing separator.
8 years ago
Dan Schaper
fad2d6b1d1
Return values start showin up now. Logic operators too...
8 years ago
Dan Schaper
9cd830b6aa
Start to refine tests and clean up code.
8 years ago
Dan Schaper
d9a16b0ff4
Clear up bottom half of script with fewer redundenicies.
8 years ago
Dan Schaper
cb5c94ef5e
Sorry, left that gravity.list parser in. Big debug files. Cleared that up.
8 years ago
Dan Schaper
85fbd66871
Good commit point, number of changes
8 years ago