321ea8a3a9
Merge branch 'development' into webUIprivacymode
2016-12-27 21:27:11 +01:00
ef8292d371
Merge branch 'development' into updater_rewrite
2016-12-27 11:59:52 -08:00
c5f5252145
Merge pull request #961 from pi-hole/customblockpage
...
Custom Pi-Hole block page
2016-12-27 10:25:03 -08:00
62d001225a
Merge pull request #1040 from pi-hole/fix/updater_git-C
...
Remove git -C from update.sh
2016-12-25 12:28:42 -08:00
e50947eb58
mend
2016-12-25 21:26:06 +01:00
ca056d32d2
Remove git -C
2016-12-25 21:22:59 +01:00
a0e0465036
Revert "Merge pull request #1018 from pi-hole/diginc-patch-1"
...
This reverts commit ff3c36a7a29355a8ad0e
2016-12-25 17:32:59 +01:00
e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail()
2016-12-25 01:18:58 +01:00
5e28e6b9ac
Removed remaining git -C
2016-12-25 01:17:46 +01:00
3365ef7aaa
`is_repo()` returns values to caller, silence function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:54:04 -08:00
68c17b26dc
Bashisms
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:41:42 -08:00
e647efd471
Shell script, not javascript
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:24:20 -08:00
15db1ffdd5
Remove variables not needed any more
2016-12-24 15:48:43 +01:00
4632b0f797
Updated updater logic
2016-12-24 15:40:31 +01:00
65c35a5530
Use new subroutine to determine if updates are available
2016-12-24 15:32:25 +01:00
c449a1c0e0
Added GitCheckUpdateAvail()
2016-12-24 15:19:39 +01:00
b020010f0d
Removed some of the &> /dev/null
2016-12-24 15:08:30 +01:00
0276c72fe2
replace 'git -C' with long version (see #1009 )
2016-12-24 15:05:57 +01:00
04a9791be2
Save empty password
2016-12-23 23:41:40 +01:00
c1982c04ff
Merge pull request #1029 from pi-hole/bogusDNS_BOGUS_PRIVentries
...
remove `DNS_BOGUS_PRIV` from setupVars.conf
2016-12-23 19:32:13 +00:00
9a62026830
remove `DNS_BOGUS_PRIV` from setupVars.conf
2016-12-23 19:27:02 +00:00
2fb0dc0a4a
add warning if SELinux is Enforcing
2016-12-23 10:27:52 -06:00
ef1ce66793
Merge pull request #1013 from pi-hole/fix/chronometer
...
Fix chronometer.sh
2016-12-23 11:12:20 +00:00
3bc5d1bae0
Merge pull request #989 from pi-hole/APIresolveclientsandupstream
...
Implement backend for AdminLTE/#253
2016-12-23 10:37:48 +00:00
ff3c36a7a2
Merge pull request #1018 from pi-hole/diginc-patch-1
...
pihole.cron reduce duplication
2016-12-23 09:41:48 +00:00
5e53f484be
Update pihole.cron
...
Stop repeating the path.
2016-12-22 22:00:17 -06:00
bb28d94884
Merge branch 'development' into customblockpage
...
Conflicts:
automated install/basic-install.sh
2016-12-22 19:22:09 +01:00
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
2016-12-22 19:09:37 +01:00
bcf8139708
Removed cat where we don't need it
2016-12-22 18:55:14 +01:00
9b0390c9da
Space to Tab
2016-12-22 18:53:44 +01:00
e88f58c34e
Remove grpping for today's log entries, because we flush the log every day
2016-12-22 18:45:53 +01:00
4626b8ced5
Removed fixed username from sudoers file
2016-12-22 13:18:38 +01:00
ee8f29d178
Fixed typo, extended help text
2016-12-20 16:28:28 +01:00
da363070c7
Added Kelvin
2016-12-20 12:21:08 +01:00
715838cf89
Allow disabling second DNS server
2016-12-19 13:42:42 +01:00
7a243f890e
Backend for privacyMode on webUI
2016-12-16 17:33:01 +01:00
afabb5957b
Implement backend for https://github.com/pi-hole/AdminLTE/pull/253
2016-12-15 18:55:40 +01:00
a0019d86c5
Merge pull request #983 from pi-hole/cronpath
...
Fix missing path information for cron
2016-12-15 07:01:20 -05:00
3c4a9bba78
Minor change
2016-12-15 10:38:24 +01:00
4348653431
Merge pull request #985 from pi-hole/pi.hole
...
A man has no name. Even though his name is Jaqen H'ghar
2016-12-15 08:49:22 +00:00
e7713a9028
add missing pihole autocomplete commands
2016-12-14 19:53:40 +00:00
684ac98c8e
Remove hostname and pi.hole entries, move to /etc/pihole/local.list
2016-12-14 19:28:01 +00:00
9a2ffabc33
Fix missing path information
2016-12-14 17:33:20 +01:00
2977168da1
dnsmasq "bogus-priv" property
2016-12-14 16:16:25 +01:00
85e3f37503
dnsmasq "domain-needed" property
2016-12-14 16:09:57 +01:00
ba015c1918
Set domain name via Settings page
2016-12-14 14:24:09 +01:00
1556adb678
Also remove quiet-dhcp setting when disabling/enabling the Pi-Hole DHCP server
2016-12-14 12:12:36 +01:00
6bfe729112
Merge pull request #979 from pi-hole/wwwdatapassword
...
Prevent web UI password change by web user
2016-12-13 16:33:41 +00:00
207422f83a
Added a missing space
2016-12-13 15:54:41 +01:00
004ba28378
Prevent web UI password change by web user
2016-12-13 15:52:28 +01:00
6f38801ed8
Add "Interface appearence" option
2016-12-13 14:59:52 +01:00
b8d2bfc890
Wait 5 seconds before rebooting so the web UI can finish loading before being unreachable due to the reboot
2016-12-13 12:42:40 +01:00
bc91716082
Suppress logging of DHCP actions to /var/log/pihole.log
2016-12-12 17:14:52 +01:00
8dc0dc4d69
Add DHCP-Server backend
2016-12-12 15:34:05 +01:00
2f4b7ce3dd
Update dnsmasq file when changing upstream DNS servers and restart the service to get it active
2016-12-12 14:17:02 +01:00
d4f83cb1d4
Be able to set API_QUERY_LOG_SHOW
2016-12-12 13:15:07 +01:00
aaab3306a8
Add restart DNS capability
2016-12-12 10:38:21 +01:00
2bafa2f2ac
Add reboot option
2016-12-11 22:33:27 +01:00
9ac378ae09
Set domains and clients which are excluded by the API
2016-12-11 19:30:04 +01:00
bf867bd9fd
Set DNS servers from web UI
2016-12-11 16:54:27 +01:00
505c9e8979
Minor change
2016-12-06 14:08:45 +01:00
75deb02961
Don't query pihole if page is hidden anyhow
2016-12-06 14:05:48 +01:00
480211033d
Detect if blocking page is loaded within frame or iframe. If so, hide everything
2016-12-06 14:05:02 +01:00
ca9321624c
Added padding for ad list results
2016-12-05 14:40:48 +01:00
40f18df90f
Simplified CSS, removed external contents
2016-12-05 14:39:07 +01:00
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; }`
2016-12-05 12:34:30 +01:00
3d6b22de6c
Update index.php to include more detailed output
2016-12-05 12:12:01 +01:00
fc233fcdd3
Fixed typo
2016-12-05 12:10:05 +01:00
20370d4348
Update CSS file
2016-12-05 11:26:21 +01:00
0f90671241
Updated index.php to use CSS file unter admin/
2016-12-05 10:51:41 +01:00
a866c4e388
Place blockingpage.css (former index.css) unter admin/ so we can load it also from some blocked sub-directories
2016-12-05 10:50:19 +01:00
e7241a989c
Include CSS file
2016-12-04 22:20:51 +01:00
6e788668f9
Updated index.php
2016-12-04 22:17:33 +01:00
b246dba7e7
Rename index.html to index.php
2016-12-04 21:41:26 +01:00
f98de3d5db
Merge pull request #941 from DL6ER/caseinsensitive
...
Improvements for black-/whitelist scripts
2016-12-04 14:33:10 -05:00
78cb43d0dc
Revert "Simplified EscapeRegexp()"
...
This reverts commit 509cfd15f2
2016-12-03 00:32:37 +01:00
509cfd15f2
Simplified EscapeRegexp()
2016-12-02 14:17:34 +01:00
2061daa902
Don't forget to escape also the slash "/"
2016-12-02 14:11:17 +01:00
629ca970a1
Changed from single quoted filter expression to double quotes as reqeusted by codacy
2016-12-02 14:08:54 +01:00
c8ad6f23a8
Properly escape any special characters before using them in regexp manner
2016-12-02 12:57:04 +01:00
925c80edd4
Catch more 1's
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 15:10:06 -08:00
2ec4acfe52
Begin fixing exit values.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 12:21:08 -08:00
7b26b308ad
No need for echo and pipe here!
2016-11-21 15:50:05 +01:00
4c10634d85
Convert domain names to lower case before checking validity of the domain
2016-11-21 15:49:11 +01:00
de4401823e
Merge pull request #924 from DL6ER/webpage.sh
...
Add webpage.sh
2016-11-20 21:43:44 +00:00
f50cbe74cb
Changed -web (webpage) to -a (admin)
2016-11-20 15:15:27 +01:00
33b6fe72da
Extended help text
2016-11-19 21:57:42 +01:00
733919be4a
Implement possibility to remove password using "pihole -web -p"
2016-11-19 21:50:15 +01:00
68cb0782c0
Add countdown timer
2016-11-18 13:27:06 -08:00
0f4c8d4923
Set default timeout to 60 seconds
2016-11-17 11:00:11 -08:00
6d2c5b2312
Add debug timeoute
2016-11-17 10:58:58 -08:00
a95ce11ca6
Add debug timeoute
2016-11-17 10:39:51 -08:00
88c161769d
Capitalized variable names.
2016-11-16 22:33:28 +01:00
01bf1ae92d
Compute double hashes to avoid rainbow table vulnerability
2016-11-16 22:13:47 +01:00
9193c71cff
Minor change
2016-11-16 21:36:19 +01:00
db278d81e4
Added webpage.sh
2016-11-16 21:34:43 +01:00
b191cd73a7
Update piholeDebug.sh
...
wording
2016-11-15 13:28:18 +00:00
ca56ca5bd8
promo-tweak
...
Better logic introduced by @PromoFaux
2016-11-06 11:16:48 -06:00
a0f0dff88e
replace hardcoded interface with var
...
setupVars.conf is already sourced, so we just need to replace the
hardcoded value with the variable name.
2016-11-06 08:18:57 -06:00
8c08e9e473
Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count
...
Bugfix/chronometer domain count
2016-11-03 13:55:29 -07:00
4300759287
Fix logic. If both v6 and v4 divide by two, else dont.
2016-11-03 08:01:25 +00:00
d7d6d6f991
Update to use new Var name
2016-11-02 21:46:30 +00:00
2f976504e8
switch out -eq for ==
2016-11-02 20:06:21 +00:00
4b7b859db9
Gotta catch 'em all...'
2016-11-02 12:29:55 -07:00
f7d0de53bb
Compare string to string.
2016-11-02 12:11:34 -07:00
603ec997ba
Remove testing block.
2016-11-02 12:09:33 -07:00
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.
2016-11-02 12:07:59 -07:00
3d43e1568c
Use explicit calls for function to self-document
2016-11-02 11:39:22 -07:00
c1a3f003e8
Rename the only utilty function left that didn't say `repo`
2016-11-02 11:18:13 -07:00
3f61aea7fc
Utility functions fully quiet now. Calling functions have the echos.
2016-11-02 11:09:53 -07:00
bd68db51e0
ShellCheck split local declaration and assignment.
2016-11-02 11:01:50 -07:00
b8a5ed710e
Take echos out of utility functions and move up a level.
2016-11-02 10:51:09 -07:00
34be601dd7
Test for lexicographically less than tag version.
2016-11-02 10:42:05 -07:00
1d64ad1ccd
Stash all changed files, clean directory and pull updates.
2016-11-02 10:39:27 -07:00
f2d7a3d26d
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
2016-11-02 09:48:00 -07:00
ee37c37cab
fix update output logic. version number variables should not be read only!
2016-11-02 14:29:20 +00:00
b636c1e1f8
Whitespace.
2016-11-02 07:00:43 -07:00
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
2016-11-02 06:57:33 -07:00
ece1667fb0
Refactor and move some bits.
2016-11-02 06:41:51 -07:00
50bd8b4a09
Further tweaks to local repo handling
2016-11-02 13:34:57 +00:00
93d91353a1
All tabs now spaced
2016-11-02 05:49:33 -07:00
8dc9143b34
Just delete, no need to cd there first.
2016-11-02 05:45:29 -07:00
a0d9a1133c
Factoring and combining functions
2016-11-02 05:34:39 -07:00
035e4bf727
Move value checks to `if` calls.
2016-11-02 03:55:04 -07:00
9ec5bbd560
Actually get `is_repo` to return a value and have it expected.
2016-11-02 03:38:35 -07:00
34482c5ed6
Modified `is_repo`
2016-11-02 03:09:59 -07:00
7d414b5628
Move version messages to main function, check for repos.
2016-11-02 01:12:02 -07:00
d9528dfd09
Bash is funny with returns.
2016-11-02 00:51:38 -07:00
9c83825cb8
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
2016-11-01 22:20:32 -07:00
7a22471787
New naming convention, and reorder functions as bash would prefer them to be.
2016-11-01 22:19:40 -07:00
c30478bf4a
cleanup and use sentintel in is_repo
2016-11-01 23:21:50 -05:00
d986746ef9
missing quote added
2016-11-01 23:07:20 -05:00
a8fa061f2e
quote all the assignments prevent accidental glob splitting
2016-11-01 23:02:06 -05:00
f8e9726922
source setupVars and check for the correct variable
2016-11-01 19:01:48 -05:00
884363bd05
remove ipv6 check since it's already in setupVars
2016-11-01 19:01:28 -05:00
bdd240ecb6
Shellcheck catch for always true expansion.
2016-11-01 15:36:27 -07:00
04da292df9
Missed one spinner, updated and exit script if github is unreachable.
2016-11-01 12:17:38 -07:00
85b8676b8e
Remove spinner, no functions here should last that long, and it masks a few potential exit avenues.
2016-11-01 12:16:46 -07:00
114bc13c23
Specify path, cron may not know where the files are located.
2016-11-01 12:03:26 -07:00
5fef5f1ed4
Break down `is_repo` to make sure it does what is expected.
2016-11-01 11:54:14 -07:00
807b60b0e6
Missed the second reinstaller....
2016-11-01 11:44:16 -07:00
fbc800e556
If unattened reinstall fails, notify user and exit script immediately.
2016-11-01 11:42:18 -07:00
1991ee7a7d
Google Style Guide. `readonly` and cap constants.
2016-11-01 11:36:44 -07:00
ffbfadbccf
Detail what the script does.
2016-11-01 11:33:04 -07:00
c3e2bce956
Variables declared as strings, make sure they are strings when we use them in functions.
2016-11-01 11:26:57 -07:00
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.
2016-11-01 11:18:41 -07:00
1e7e5230cc
Clarify what exactly is being called and the expected returned value format
2016-11-01 11:15:21 -07:00
f1efc97357
Clairfy condition to make sure they operate as per the specs of the logic flow layout.
2016-11-01 11:04:33 -07:00
d6fe48112c
Merge pull request #857 from pi-hole/feature/debugUpdate
...
Debug Updates
2016-10-29 23:15:07 +01:00
dcf6e6b14d
Clarify user action required to end the scripts.
2016-10-29 12:24:22 -07:00
DL6ER
Dan Schaper
DL6ER
Dan Schaper
Adam Warner
Promofaux
bcambl
Adam Hill
DL6ER
Mcat12
Jacob Salmela
Adam Warner
Dan Schaper