Mcat12
089b98430f
Fix formatting
2016-12-30 12:59:05 -05:00
DL6ER
5c7fc05a32
Enable DHCP logging by default
2016-12-30 16:31:57 +00:00
DL6ER
09bbc81470
Add notice that the user might have to flush his DNS cache
2016-12-30 12:27:33 +00:00
Dan Schaper
f7274addcd
Delete swapfile generator, haven't used this in a long time.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-30 04:08:32 -08:00
DL6ER
09bfa2ef77
Add whitelisting on blocking page feature
2016-12-30 12:03:45 +00:00
DL6ER
9181a4a1d8
Apply dhcp lease time also for IPv6
2016-12-29 14:26:23 +00:00
DL6ER
3268e1611a
Backend accept and apply dhcp lease time
2016-12-29 14:19:44 +00:00
DL6ER
cf724176dc
Do stateful DHCPv6 and SLAAC
2016-12-28 20:02:48 +00:00
DL6ER
1e627c7e8f
Make webpage.sh fully library style
2016-12-28 16:25:14 +00:00
DL6ER
9af26cbaac
Major simplification of webpage.sh
2016-12-28 02:14:47 +00:00
DL6ER
321ea8a3a9
Merge branch 'development' into webUIprivacymode
2016-12-27 21:27:11 +01:00
Dan Schaper
ef8292d371
Merge branch 'development' into updater_rewrite
2016-12-27 11:59:52 -08:00
Dan Schaper
c5f5252145
Merge pull request #961 from pi-hole/customblockpage
...
Custom Pi-Hole block page
2016-12-27 10:25:03 -08:00
Dan Schaper
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
DL6ER
e50947eb58
mend
2016-12-25 21:26:06 +01:00
DL6ER
ca056d32d2
Remove git -C
2016-12-25 21:22:59 +01:00
DL6ER
a0e0465036
Revert "Merge pull request #1018 from pi-hole/diginc-patch-1"
...
This reverts commit ff3c36a7a2
, reversing
changes made to 9355a8ad0e
.
2016-12-25 17:32:59 +01:00
DL6ER
e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail()
2016-12-25 01:18:58 +01:00
DL6ER
5e28e6b9ac
Removed remaining git -C
2016-12-25 01:17:46 +01:00
Dan Schaper
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
Dan Schaper
68c17b26dc
Bashisms
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:41:42 -08:00
Dan Schaper
e647efd471
Shell script, not javascript
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:24:20 -08:00
DL6ER
15db1ffdd5
Remove variables not needed any more
2016-12-24 15:48:43 +01:00
DL6ER
4632b0f797
Updated updater logic
2016-12-24 15:40:31 +01:00
DL6ER
65c35a5530
Use new subroutine to determine if updates are available
2016-12-24 15:32:25 +01:00
DL6ER
c449a1c0e0
Added GitCheckUpdateAvail()
2016-12-24 15:19:39 +01:00
DL6ER
b020010f0d
Removed some of the &> /dev/null
2016-12-24 15:08:30 +01:00
DL6ER
0276c72fe2
replace 'git -C' with long version (see #1009 )
2016-12-24 15:05:57 +01:00
DL6ER
04a9791be2
Save empty password
2016-12-23 23:41:40 +01:00
Adam Warner
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
Promofaux
9a62026830
remove DNS_BOGUS_PRIV
from setupVars.conf
2016-12-23 19:27:02 +00:00
bcambl
2fb0dc0a4a
add warning if SELinux is Enforcing
2016-12-23 10:27:52 -06:00
Adam Warner
ef1ce66793
Merge pull request #1013 from pi-hole/fix/chronometer
...
Fix chronometer.sh
2016-12-23 11:12:20 +00:00
Adam Warner
3bc5d1bae0
Merge pull request #989 from pi-hole/APIresolveclientsandupstream
...
Implement backend for AdminLTE/#253
2016-12-23 10:37:48 +00:00
Adam Warner
ff3c36a7a2
Merge pull request #1018 from pi-hole/diginc-patch-1
...
pihole.cron reduce duplication
2016-12-23 09:41:48 +00:00
Adam Hill
5e53f484be
Update pihole.cron
...
Stop repeating the path.
2016-12-22 22:00:17 -06:00
DL6ER
bb28d94884
Merge branch 'development' into customblockpage
...
Conflicts:
automated install/basic-install.sh
2016-12-22 19:22:09 +01:00
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
2016-12-22 19:09:37 +01:00
DL6ER
bcf8139708
Removed cat where we don't need it
2016-12-22 18:55:14 +01:00
DL6ER
9b0390c9da
Space to Tab
2016-12-22 18:53:44 +01:00
DL6ER
e88f58c34e
Remove grpping for today's log entries, because we flush the log every day
2016-12-22 18:45:53 +01:00
DL6ER
4626b8ced5
Removed fixed username from sudoers file
2016-12-22 13:18:38 +01:00
DL6ER
ee8f29d178
Fixed typo, extended help text
2016-12-20 16:28:28 +01:00
DL6ER
da363070c7
Added Kelvin
2016-12-20 12:21:08 +01:00
DL6ER
715838cf89
Allow disabling second DNS server
2016-12-19 13:42:42 +01:00
DL6ER
7a243f890e
Backend for privacyMode on webUI
2016-12-16 17:33:01 +01:00
DL6ER
afabb5957b
Implement backend for https://github.com/pi-hole/AdminLTE/pull/253
2016-12-15 18:55:40 +01:00
Mcat12
a0019d86c5
Merge pull request #983 from pi-hole/cronpath
...
Fix missing path information for cron
2016-12-15 07:01:20 -05:00
DL6ER
3c4a9bba78
Minor change
2016-12-15 10:38:24 +01:00
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
2016-12-15 08:49:22 +00:00
Promofaux
e7713a9028
add missing pihole autocomplete commands
2016-12-14 19:53:40 +00:00
Promofaux
684ac98c8e
Remove hostname and pi.hole entries, move to /etc/pihole/local.list
2016-12-14 19:28:01 +00:00
DL6ER
9a2ffabc33
Fix missing path information
2016-12-14 17:33:20 +01:00
DL6ER
2977168da1
dnsmasq "bogus-priv" property
2016-12-14 16:16:25 +01:00
DL6ER
85e3f37503
dnsmasq "domain-needed" property
2016-12-14 16:09:57 +01:00
DL6ER
ba015c1918
Set domain name via Settings page
2016-12-14 14:24:09 +01:00
DL6ER
1556adb678
Also remove quiet-dhcp setting when disabling/enabling the Pi-Hole DHCP server
2016-12-14 12:12:36 +01:00
Adam Warner
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
DL6ER
207422f83a
Added a missing space
2016-12-13 15:54:41 +01:00
DL6ER
004ba28378
Prevent web UI password change by web user
2016-12-13 15:52:28 +01:00
DL6ER
6f38801ed8
Add "Interface appearence" option
2016-12-13 14:59:52 +01:00
DL6ER
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
DL6ER
bc91716082
Suppress logging of DHCP actions to /var/log/pihole.log
2016-12-12 17:14:52 +01:00
DL6ER
8dc0dc4d69
Add DHCP-Server backend
2016-12-12 15:34:05 +01:00
DL6ER
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
DL6ER
d4f83cb1d4
Be able to set API_QUERY_LOG_SHOW
2016-12-12 13:15:07 +01:00
DL6ER
aaab3306a8
Add restart DNS capability
2016-12-12 10:38:21 +01:00
DL6ER
2bafa2f2ac
Add reboot option
2016-12-11 22:33:27 +01:00
DL6ER
9ac378ae09
Set domains and clients which are excluded by the API
2016-12-11 19:30:04 +01:00
DL6ER
bf867bd9fd
Set DNS servers from web UI
2016-12-11 16:54:27 +01:00
DL6ER
505c9e8979
Minor change
2016-12-06 14:08:45 +01:00
DL6ER
75deb02961
Don't query pihole if page is hidden anyhow
2016-12-06 14:05:48 +01:00
DL6ER
480211033d
Detect if blocking page is loaded within frame or iframe. If so, hide everything
2016-12-06 14:05:02 +01:00
DL6ER
ca9321624c
Added padding for ad list results
2016-12-05 14:40:48 +01:00
DL6ER
40f18df90f
Simplified CSS, removed external contents
2016-12-05 14:39:07 +01:00
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; }
2016-12-05 12:34:30 +01:00
DL6ER
3d6b22de6c
Update index.php to include more detailed output
2016-12-05 12:12:01 +01:00
DL6ER
fc233fcdd3
Fixed typo
2016-12-05 12:10:05 +01:00
DL6ER
20370d4348
Update CSS file
2016-12-05 11:26:21 +01:00
DL6ER
0f90671241
Updated index.php to use CSS file unter admin/
2016-12-05 10:51:41 +01:00
DL6ER
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
DL6ER
e7241a989c
Include CSS file
2016-12-04 22:20:51 +01:00
DL6ER
6e788668f9
Updated index.php
2016-12-04 22:17:33 +01:00
DL6ER
b246dba7e7
Rename index.html to index.php
2016-12-04 21:41:26 +01:00
Mcat12
f98de3d5db
Merge pull request #941 from DL6ER/caseinsensitive
...
Improvements for black-/whitelist scripts
2016-12-04 14:33:10 -05:00
DL6ER
78cb43d0dc
Revert "Simplified EscapeRegexp()"
...
This reverts commit 509cfd15f2
.
2016-12-03 00:32:37 +01:00
DL6ER
509cfd15f2
Simplified EscapeRegexp()
2016-12-02 14:17:34 +01:00
DL6ER
2061daa902
Don't forget to escape also the slash "/"
2016-12-02 14:11:17 +01:00
DL6ER
629ca970a1
Changed from single quoted filter expression to double quotes as reqeusted by codacy
2016-12-02 14:08:54 +01:00
DL6ER
c8ad6f23a8
Properly escape any special characters before using them in regexp manner
2016-12-02 12:57:04 +01:00
Dan Schaper
925c80edd4
Catch more 1's
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 15:10:06 -08:00
Dan Schaper
2ec4acfe52
Begin fixing exit values.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 12:21:08 -08:00
DL6ER
7b26b308ad
No need for echo and pipe here!
2016-11-21 15:50:05 +01:00
DL6ER
4c10634d85
Convert domain names to lower case before checking validity of the domain
2016-11-21 15:49:11 +01:00
Adam Warner
de4401823e
Merge pull request #924 from DL6ER/webpage.sh
...
Add webpage.sh
2016-11-20 21:43:44 +00:00
DL6ER
f50cbe74cb
Changed -web (webpage) to -a (admin)
2016-11-20 15:15:27 +01:00
DL6ER
33b6fe72da
Extended help text
2016-11-19 21:57:42 +01:00
DL6ER
733919be4a
Implement possibility to remove password using "pihole -web -p"
2016-11-19 21:50:15 +01:00
Dan Schaper
68cb0782c0
Add countdown timer
2016-11-18 13:27:06 -08:00
Dan Schaper
0f4c8d4923
Set default timeout to 60 seconds
2016-11-17 11:00:11 -08:00
Dan Schaper
6d2c5b2312
Add debug timeoute
2016-11-17 10:58:58 -08:00
Dan Schaper
a95ce11ca6
Add debug timeoute
2016-11-17 10:39:51 -08:00
DL6ER
88c161769d
Capitalized variable names.
2016-11-16 22:33:28 +01:00
DL6ER
01bf1ae92d
Compute double hashes to avoid rainbow table vulnerability
2016-11-16 22:13:47 +01:00
DL6ER
9193c71cff
Minor change
2016-11-16 21:36:19 +01:00
DL6ER
db278d81e4
Added webpage.sh
2016-11-16 21:34:43 +01:00
Adam Warner
b191cd73a7
Update piholeDebug.sh
...
wording
2016-11-15 13:28:18 +00:00
Jacob Salmela
ca56ca5bd8
promo-tweak
...
Better logic introduced by @PromoFaux
2016-11-06 11:16:48 -06:00
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.
2016-11-06 08:18:57 -06:00
Dan Schaper
8c08e9e473
Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count
...
Bugfix/chronometer domain count
2016-11-03 13:55:29 -07:00
Adam Warner
4300759287
Fix logic. If both v6 and v4 divide by two, else dont.
2016-11-03 08:01:25 +00:00
Promofaux
d7d6d6f991
Update to use new Var name
2016-11-02 21:46:30 +00:00
Promofaux
2f976504e8
switch out -eq for ==
2016-11-02 20:06:21 +00:00
Dan Schaper
4b7b859db9
Gotta catch 'em all...'
2016-11-02 12:29:55 -07:00
Dan Schaper
f7d0de53bb
Compare string to string.
2016-11-02 12:11:34 -07:00
Dan Schaper
603ec997ba
Remove testing block.
2016-11-02 12:09:33 -07:00
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.
2016-11-02 12:07:59 -07:00
Dan Schaper
3d43e1568c
Use explicit calls for function to self-document
2016-11-02 11:39:22 -07:00
Dan Schaper
c1a3f003e8
Rename the only utilty function left that didn't say repo
2016-11-02 11:18:13 -07:00
Dan Schaper
3f61aea7fc
Utility functions fully quiet now. Calling functions have the echos.
2016-11-02 11:09:53 -07:00
Dan Schaper
bd68db51e0
ShellCheck split local declaration and assignment.
2016-11-02 11:01:50 -07:00
Dan Schaper
b8a5ed710e
Take echos out of utility functions and move up a level.
2016-11-02 10:51:09 -07:00
Dan Schaper
34be601dd7
Test for lexicographically less than tag version.
2016-11-02 10:42:05 -07:00
Dan Schaper
1d64ad1ccd
Stash all changed files, clean directory and pull updates.
2016-11-02 10:39:27 -07:00
Dan Schaper
f2d7a3d26d
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
2016-11-02 09:48:00 -07:00
Adam Warner
ee37c37cab
fix update output logic. version number variables should not be read only!
2016-11-02 14:29:20 +00:00
Dan Schaper
b636c1e1f8
Whitespace.
2016-11-02 07:00:43 -07:00
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
2016-11-02 06:57:33 -07:00
Dan Schaper
ece1667fb0
Refactor and move some bits.
2016-11-02 06:41:51 -07:00
Adam Warner
50bd8b4a09
Further tweaks to local repo handling
2016-11-02 13:34:57 +00:00
Dan Schaper
93d91353a1
All tabs now spaced
2016-11-02 05:49:33 -07:00
Dan Schaper
8dc9143b34
Just delete, no need to cd there first.
2016-11-02 05:45:29 -07:00
Dan Schaper
a0d9a1133c
Factoring and combining functions
2016-11-02 05:34:39 -07:00
Dan Schaper
035e4bf727
Move value checks to if
calls.
2016-11-02 03:55:04 -07:00
Dan Schaper
9ec5bbd560
Actually get is_repo
to return a value and have it expected.
2016-11-02 03:38:35 -07:00
Dan Schaper
34482c5ed6
Modified is_repo
2016-11-02 03:09:59 -07:00
Dan Schaper
7d414b5628
Move version messages to main function, check for repos.
2016-11-02 01:12:02 -07:00
Dan Schaper
d9528dfd09
Bash is funny with returns.
2016-11-02 00:51:38 -07:00
Dan Schaper
9c83825cb8
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
2016-11-01 22:20:32 -07:00
Dan Schaper
7a22471787
New naming convention, and reorder functions as bash would prefer them to be.
2016-11-01 22:19:40 -07:00
diginc
c30478bf4a
cleanup and use sentintel in is_repo
2016-11-01 23:21:50 -05:00
diginc
d986746ef9
missing quote added
2016-11-01 23:07:20 -05:00
diginc
a8fa061f2e
quote all the assignments prevent accidental glob splitting
2016-11-01 23:02:06 -05:00
Jacob Salmela
f8e9726922
source setupVars and check for the correct variable
2016-11-01 19:01:48 -05:00
Jacob Salmela
884363bd05
remove ipv6 check since it's already in setupVars
2016-11-01 19:01:28 -05:00
Dan Schaper
bdd240ecb6
Shellcheck catch for always true expansion.
2016-11-01 15:36:27 -07:00
Dan Schaper
04da292df9
Missed one spinner, updated and exit script if github is unreachable.
2016-11-01 12:17:38 -07:00
Dan Schaper
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
Dan Schaper
114bc13c23
Specify path, cron may not know where the files are located.
2016-11-01 12:03:26 -07:00
Dan Schaper
5fef5f1ed4
Break down is_repo
to make sure it does what is expected.
2016-11-01 11:54:14 -07:00
Dan Schaper
807b60b0e6
Missed the second reinstaller....
2016-11-01 11:44:16 -07:00
Dan Schaper
fbc800e556
If unattened reinstall fails, notify user and exit script immediately.
2016-11-01 11:42:18 -07:00
Dan Schaper
1991ee7a7d
Google Style Guide. readonly
and cap constants.
2016-11-01 11:36:44 -07:00
Dan Schaper
ffbfadbccf
Detail what the script does.
2016-11-01 11:33:04 -07:00
Dan Schaper
c3e2bce956
Variables declared as strings, make sure they are strings when we use them in functions.
2016-11-01 11:26:57 -07:00
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.
2016-11-01 11:18:41 -07:00
Dan Schaper
1e7e5230cc
Clarify what exactly is being called and the expected returned value format
2016-11-01 11:15:21 -07:00
Dan Schaper
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
Adam Warner
d6fe48112c
Merge pull request #857 from pi-hole/feature/debugUpdate
...
Debug Updates
2016-10-29 23:15:07 +01:00
Dan Schaper
dcf6e6b14d
Clarify user action required to end the scripts.
2016-10-29 12:24:22 -07:00
Dan Schaper
908697a963
User token instructions, and small bugfix for missing separator.
2016-10-29 12:04:18 -07:00
Dan Schaper
fad2d6b1d1
Return values start showin up now. Logic operators too...
2016-10-28 15:53:18 -07:00
Dan Schaper
9cd830b6aa
Start to refine tests and clean up code.
2016-10-28 15:37:45 -07:00
Dan Schaper
d9a16b0ff4
Clear up bottom half of script with fewer redundenicies.
2016-10-28 15:25:06 -07:00
Dan Schaper
cb5c94ef5e
Sorry, left that gravity.list parser in. Big debug files. Cleared that up.
2016-10-28 15:13:04 -07:00
Dan Schaper
85fbd66871
Good commit point, number of changes
2016-10-28 14:52:08 -07:00
Eric Warnke
3da75d6125
Grep was leaking a file not found if blacklist didn't exist
2016-10-28 17:28:04 -04:00
Dan Schaper
d4a3a5c180
Trying to implement The Brontide Idiom for design.
2016-10-28 10:42:30 -07:00
Dan Schaper
71e3a473d6
Fix = underbar
2016-10-28 07:16:16 -07:00
Dan Schaper
c2cfc09f63
Clean up more of the UX and log. Lots to go.
2016-10-28 07:06:05 -07:00
Dan Schaper
01f10b56e8
Refactor out some more reudndant code.
2016-10-28 06:51:30 -07:00
Dan Schaper
90ec0a610e
Tricorder is introduced.
2016-10-28 04:42:45 -07:00
Dan Schaper
42bff1ce1b
Move parse utility to be near other parsing functions.
2016-10-28 03:53:53 -07:00
Dan Schaper
e3c7a1f31f
Top half user output updated.
2016-10-28 03:49:03 -07:00
Dan Schaper
0debbffa70
Add a couple of parsing utility functions.
2016-10-28 03:45:07 -07:00
Jacob Salmela
473b58d26d
Merge pull request #704 from stonedbovines/development
...
lighttpd.conf templates change
2016-10-27 20:22:46 -05:00
Dan Schaper
300001e766
Remove listen-address
directive
...
Since we declare an `interface` `dnsmasq` should ignore the `listen-address` directive thus making redundant. Removed.
2016-10-27 11:56:16 -07:00
Adam Warner
21fc6344bf
Merge pull request #849 from pi-hole/aManHasNoNameResolution
...
[BugFix] A man has no name resolution
2016-10-27 19:41:07 +01:00
Dan Schaper
f9570a82cc
Remove glitchy daemon detection.
2016-10-27 00:58:24 -07:00
Dan Schaper
36285ead57
Just becuase this is bugging me, but I'll fix it later.
2016-10-27 00:32:18 -07:00
Dan Schaper
13e488dace
Daemon check for lighttpd and dnsmasq.
2016-10-27 00:30:51 -07:00
Dan Schaper
f169da8fd0
Set for quiet temporarily.
2016-10-26 14:48:11 -07:00
Dan Schaper
60741298b7
Cut more verbosity. Prep for lsof
parsing and daemon tests.
2016-10-26 14:33:47 -07:00
Dan Schaper
f73734acb0
Only check IPv6 Gateway if it exists.
2016-10-26 13:57:57 -07:00
Dan Schaper
fc360abe43
Only check IPv6 if system is enabled.
2016-10-26 12:22:20 -07:00
Adam Warner
3996e11425
Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist
...
Improvements to White and Blacklists
2016-10-26 19:52:16 +01:00
Dan Schaper
98db002770
Tighten IP test reponse to user.
2016-10-26 11:38:19 -07:00
Eric Warnke
f1c1caf7bd
url.rewrite does not work in $HTTP block lighttpd bug #2526
2016-10-26 11:49:42 -04:00
Eric Warnke
e2997b8135
Due to lighttpd bug 2526 the url.rewrite for javascript must be placed
...
outside of the $HTTP block or it will never evaluate.
2016-10-26 11:49:31 -04:00
Adam Warner
0d6a6b97f9
remove whitelist and blacklist scripts
2016-10-26 09:56:45 +01:00
Adam Warner
469ff45f01
create list.sh. Combines whitelist and blacklist scripts in an effort to reduce code duplication.
...
update pihole script to reflect new white/blacklist command.
2016-10-26 09:36:02 +01:00
Dan Schaper
4269626f5d
Attribute source for bashism.
2016-10-25 21:53:41 -07:00
Dan Schaper
8fa897aadb
Add back in sourcing files (setupVars.conf) and tweak ip_check
2016-10-25 21:39:28 -07:00
Dan Schaper
f549618d12
Move environment IPv6 interface check to ip_check
and fix IPv6 source routing issue.
2016-10-25 21:25:57 -07:00
Dan Schaper
2fa47aaf31
Source routing is deprecated by RFC5095
2016-10-25 20:53:18 -07:00
Dan Schaper
b0874fb23a
Temporarily get rid of gateway sourcing from setupVars, temporarily.
2016-10-25 19:53:00 -07:00
Dan Schaper
fb70fd77e8
Prototype version_check, add helper functions for logging and echo.
2016-10-25 17:50:14 -07:00
Dan Schaper
01f17f9cbb
Reduce header verbosity. New header writer.
2016-10-25 17:19:33 -07:00
Adam Warner
18005ceee8
add hostname lines in 01-pihole.conf
2016-10-25 15:03:49 +01:00
Adam Warner
eb52f81a5c
add pi.hole entries to 01-pihole.conf
2016-10-25 14:54:10 +01:00
Adam Warner
aba0d93fda
Merge pull request #814 from pi-hole/promoTweaksTheSecond
...
Various tweaks and fixes: Part 2 (Plus Pause/Resume button functionality!)
2016-10-25 17:43:40 +06:00
Promofaux
b49384ffe4
intent
2016-10-23 22:44:21 +01:00
Promofaux
7fb622638b
flip reload logic. Do not reload if there are not changes made to blacklist.txt
2016-10-23 22:44:06 +01:00
Promofaux
bd0cc134bf
MERGE FAIL :ashamed_face:
2016-10-23 22:43:11 +01:00
Promofaux
476fd1f695
indentation
2016-10-23 22:38:18 +01:00
Promofaux
96053d13be
Flip reload logic. Do not reload lists if no changes made to whitelist.txt
2016-10-23 22:38:06 +01:00
Promofaux
c958bed418
Consistency changes. Replace MOST uses of echo >> ${DebugLog}
with usage of log_write
function
2016-10-23 22:31:20 +01:00
Promofaux
2b2c240d39
Fix shebang line broken in #831
...
Remove root check and references to ${SUDO}
Check for /etc/pihole/setupVars.conf and use piholeInterace in IPv6 checks as suggest by @jacobsalmela https://github.com/pi-hole/pi-hole/pull/831#issuecomment-255606854
2016-10-23 22:15:10 +01:00
Promofaux
b79392ba2c
exit after displaying white/blacklist
2016-10-23 19:49:51 +01:00
Promofaux
d0826b2c33
Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
2016-10-23 19:33:28 +01:00
Marcus Hildum
5d6072524c
Consistency
...
Missed one
2016-10-22 10:26:00 -07:00
Marcus Hildum
07a66a70fc
Consistency
...
More of the same
2016-10-22 10:12:05 -07:00
Marcus Hildum
69ba8a3c2f
Consistency
...
Again trying to move the repo to one style. Doesn't matter if it's
changed afterwards, but one style instead of about five seems
saner.
2016-10-22 10:01:15 -07:00
Marcus Hildum
a30c75ef71
Consistency
...
Cleanup!
2016-10-22 00:35:44 -07:00
Marcus Hildum
d0b3727c5d
Consistency
...
Yet more cleanup
2016-10-22 00:32:36 -07:00
Marcus Hildum
6e94bf5b6d
Consistency
...
You know the drill
2016-10-22 00:14:38 -07:00
Marcus Hildum
0f04e270a7
consistency
...
Just more cleanup
2016-10-22 00:10:25 -07:00
Adam Warner
44a36368a2
Merge pull request #822 from pi-hole/ChangeWarning
...
Add file change warning to header
2016-10-21 11:24:12 +01:00
Promofaux
c0012540ed
Re-add shebang
2016-10-20 21:08:07 +01:00
Promofaux
9ab6df0e54
Merge branch 'development' into promoTweaksTheSecond
...
# Conflicts:
# advanced/Scripts/blacklist.sh
# advanced/Scripts/whitelist.sh
2016-10-20 21:06:28 +01:00
Adam Warner
3623183072
Remove reference to non-existent script
2016-10-20 13:29:12 +01:00
Dan Schaper
e6bd979aeb
Can't spell
...
Fix spelling error
2016-10-20 04:27:12 -07:00
Dan Schaper
b5b6350cc7
Add file change warning to header
2016-10-20 03:42:25 -07:00
Marcus Hildum
0efda04920
Use heredocs instead of multiple calls to echo
...
There were a lot of places (like in help functions) that used multiple
echo calls instead of heredocs. Personal opinion but this seems cleaner.
2016-10-19 20:46:37 -07:00
Marcus Hildum
28eeaf201b
Standardize function declaration
...
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical
myfucn() {
}
style.
2016-10-19 19:47:45 -07:00
Promofaux
a64f4cd871
whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument
2016-10-19 23:17:20 +01:00
Promofaux
a41eff1276
Blacklist script now only directly edits blacklist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument
2016-10-19 23:16:52 +01:00
Adam Warner
b66f23cfd0
account for new update script
2016-10-18 14:19:44 +01:00
Adam Warner
27d6e5d8cf
Complete overhaul of update logic. Moved to seperate script
2016-10-18 14:19:25 +01:00
Adam Warner
ce46c4dec4
remove prematurely added code
2016-10-18 12:11:02 +01:00
Adam Warner
013d77488a
complete overhaul of version script. Now with optional arguments!
2016-10-18 12:07:11 +01:00
Adam Warner
29ad2496b6
don't output "elevating with sudo" in pihole script, just do it.
2016-10-18 12:05:48 +01:00
Adam Warner
97a013b2b7
Add direction to change upstream servers in setupVars.conf
2016-10-18 10:35:22 +01:00
Adam Warner
77808223dc
remove stock comments from 01-pihole.conf and add warning to the top
2016-10-18 10:05:10 +01:00
Promofaux
8c0f860601
Use systemctl/service calls instead of killall to restart/reload dnsmasq
2016-10-16 17:16:59 +01:00
Promofaux
7e10dcdcf0
update pihole bash-completion
2016-10-15 20:12:16 +01:00
Promofaux
090fbd04af
Remove ${SUDO} usages and root checks from scripts called by pihole
command as they should not be called directly.
2016-10-15 17:54:04 +01:00
Jakob Ackermann
28ef8068c8
add mimetype for .svg
...
Chrome does not display .svg-images without the correct mimetype
2016-10-05 01:20:30 +02:00
Dan Schaper
9a421d510a
Ignore comments in adlists.list section.
2016-10-01 13:16:58 -07:00
Dan Schaper
a9c3e2c7ba
Add log_write function. Update version_check to use logical conditionals.
2016-09-28 13:09:38 -07:00
Dan Schaper
7fcb40739d
Close IF statement
2016-09-28 10:25:37 -07:00
Dan Schaper
5a3d319677
Add fail check to dig local and remote.
2016-09-28 10:24:44 -07:00
Dan Schaper
8466d0b681
Change NSLOOKUP to dig for resolver tests, add dnsmasq specific records check
2016-09-28 10:14:47 -07:00
Dan Schaper
5de179f1eb
Remove blacklist comparison.
2016-09-28 09:52:11 -07:00
Dan Schaper
36e10595cc
Change netstat to lsof.
2016-09-28 09:51:14 -07:00
Dan Schaper
edd7f28104
Add internet checks to IP section
2016-09-27 19:39:28 -07:00
Dan Schaper
dba1ab3fc0
Remove compareWhitelist
2016-09-27 19:31:21 -07:00
Dan Schaper
3df9c48012
Include ping statistics in default gateway checks.
2016-09-27 19:30:37 -07:00
Dan Schaper
ac1c299369
Revert overzealous renaming of Pi-hole in pihole.log detection.
2016-09-26 20:54:05 -07:00
Dan Schaper
5bbb3ac49a
Standardize Pi-hole naming.
2016-09-26 20:50:03 -07:00
Dan Schaper
014bdf911a
Add open port detection
2016-09-26 20:39:39 -07:00
Dan Schaper
874853fe18
Add lighttpd to version check
2016-09-26 19:23:30 -07:00
Dan Schaper
274b71f8bc
Relocate hostname checks
2016-09-26 18:52:12 -07:00
Dan Schaper
c41d543d81
Handle lack of IPv6 gracefully.
2016-09-26 18:27:02 -07:00
Dan Schaper
7729ddab30
Mode code realignment. Handle lack of IPv6 gateway gracefully.
2016-09-26 18:21:58 -07:00
Dan Schaper
60c0e59a83
Add IPv6 intelligence to debug
2016-09-26 18:06:31 -07:00
Steve Dobinson
737b510116
Update lighttpd.conf.fedora
...
Allow for password protection (or other user-initiated options) without clobbering already chosen user options.
2016-09-20 10:38:58 +01:00
Steve Dobinson
47cba83450
Update lighttpd.conf.debian
...
Allow for password protection (or other user-initiated options) without clobbering already chosen user options.
2016-09-20 10:34:21 +01:00
Adam Warner
dcedf6bfd0
Merge branch 'development' into PromoFaux-patch-1
2016-09-19 20:54:04 +01:00
Promofaux
3d5140458b
Change cron job
2016-09-19 20:43:04 +01:00
Adam Warner
b1a7b0a186
Update piholeDebug.sh
...
I can spell, honest.
2016-09-15 15:16:06 +01:00
Promofaux
a3ef9efd2f
remove updateDashboard script
2016-09-12 19:09:19 +01:00
Promofaux
95ee3216c4
Add the newer pihole command tags to the bash auto complete!
2016-09-06 21:57:17 +01:00
Adam Warner
eb201b614a
Change log flush time to 00:00
2016-09-06 19:29:30 +01:00
Adam Warner
8cb2f85a08
Replace truncate
command with echo " " >
2016-09-02 16:39:34 +01:00
Promofaux
01a9534729
Merge branch 'development' into UpdateMethod
...
# Conflicts:
# automated install/basic-install.sh
2016-08-30 19:32:40 +01:00
Promofaux
b3e7619048
curly brackets all the variables!
2016-08-21 02:12:02 +01:00
Victor Marquez
0121136498
Added window.close() to index.html
...
Adding window.close() will automatically close any pop-ups that might get loaded with a blocked ad.
2016-08-19 20:45:17 -04:00
Adam Warner
95edb49bb8
Add option for uploading debug log to termbin
2016-08-05 12:47:57 +01:00
Promofaux
e11ef5a7f0
Add version display script. Also checks current version on web and reports version.
2016-08-02 20:07:09 +01:00
diginc
5fb6c5b012
Making the whitelist re-block echo consistent with other WL/BL echos
2016-07-20 12:53:31 -05:00
diginc
3affa73257
Only re-block whitelist deletions if in adlists
...
* Prevent blocking benign/untracked domains deleted off whitelist
* Issue #581
2016-07-20 12:43:30 -05:00
Dan Schaper
ce8f07750f
Remove trailing slash on os-release check
...
Fixes #CLOSED
Remove trailing slash that would cause an os-check to always fail out.
2016-07-15 22:46:21 -07:00
Promofaux
61ff12e8d4
Change header to match the rest of the scripts.
2016-07-15 21:17:16 +01:00
Promofaux
e942440bb7
Dan forgot this : }
2016-07-15 21:11:10 +01:00
Promofaux
6f068e0b9c
Replace sprunge.us with termbin, which appears to be more reliable.
2016-07-15 19:32:49 +01:00
Sander
11f2524b9b
Instead of an or, cat *release
2016-07-14 20:47:27 +02:00
Dan Schaper
b011e5f838
Add os-release check
2016-07-14 11:35:52 -07:00
Dan Schaper
f45eb84d6b
Add distribution Check
2016-07-14 11:27:47 -07:00
Daniel
9b8efe1b27
Upload log to sprunge.us
2016-07-03 19:50:42 -04:00
bcambl
27a9642090
check for sudo via 'command -v' instead of dkpg-query
2016-06-11 15:58:49 -06:00
bcambl
376eb81181
SELinux Support
2016-06-11 15:58:49 -06:00
bcambl
66724826f5
moved php-fastcgi.socket to /tmp on Fedora
...
fastcgi is spawned by lighttpd (lighttpd user).
/var/run is owned by root, so we will put the socket in /tmp
2016-06-11 15:58:49 -06:00
bcambl
62fa9c0f6e
fixing whitespace
2016-06-11 15:58:48 -06:00
bcambl
6f2117d786
append '.debian' to lighttpd.conf for compatability
2016-06-11 15:58:48 -06:00
bcambl
d67957d015
add fedora lighttpd.conf template
2016-06-11 15:58:48 -06:00
Mcat12
a16cd9aef7
Merge pull request #469 from pi-hole/web-sudo
...
Give WebUI permissions to run pihole commands
2016-05-26 18:45:04 -04:00
Mcat12
3fda2d9ac3
Fix helpfunc not found error
2016-05-25 17:07:12 -04:00
Carter Maxwell
c0e1772e21
Replace toilet with echo
2016-05-07 11:44:18 -07:00
Mcat12
f03303e5aa
Add X-Pi-hole header
2016-05-03 11:58:13 -04:00
Mcat12
7bc2844b9d
Remove X-Pi-hole header
...
Also adds `X-Frame-Options: DENY` for the admin directory, so that
an ad can't load it into a frame
2016-05-02 18:51:02 -04:00
Jim Liu
08e6f60941
Update blacklist.sh
2016-04-22 01:42:43 +08:00
Jim Liu
10066209e7
Update whitelist.sh
...
Change piholeIPfile to a permanent location.
2016-04-22 01:41:11 +08:00
Jim Liu
81fdfcba22
Update whitelist.sh
2016-04-21 23:40:38 +08:00
Mcat12
619082dbed
Merge branch 'development' into BugFix463
...
Conflicts:
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
2016-04-20 15:54:58 -04:00
Mcat12
d7abbbfac4
Change mode of sudoer file
2016-04-17 22:49:47 -04:00
Mcat12
c714196647
Add Sudoer file for WebUI
2016-04-17 22:46:06 -04:00
Mayur Raiturkar
56ac04c48e
fixed helpFunc 2
2016-04-17 18:22:06 +05:30
Mayur Raiturkar
b58519b974
fixed helpFunc 1
2016-04-17 18:21:32 +05:30
Promofaux
ad574f5e90
Replace kill with killall
2016-04-16 15:52:38 +01:00
Promofaux
4941a657bf
remove -s switch, as it turns out it worked afterall.
2016-04-16 12:59:40 +01:00
Promofaux
3d4bff9414
Add -s switch to kill command to increase compatability
2016-04-16 10:56:49 +01:00
Adam Warner
77f4126f9b
add root check to whitelist script
2016-04-13 15:51:48 +01:00
Adam Warner
4c890ab202
Add root check to blacklist script
2016-04-13 15:50:48 +01:00
Adam Warner
d10e9b1b6e
add pihole/webui version numbers
2016-04-12 08:47:30 +01:00
Adam Warner
a6bee76581
add location of debug log output file!
2016-04-12 08:24:34 +01:00
nate
2f4f5a6ad2
Added lighttpd error.log to debug output
2016-04-11 18:35:44 -05:00
Promofaux
48fa83c9ac
Fix whitespace
2016-04-10 21:36:33 +01:00
Promofaux
05e0003555
Fixes issue #453
2016-04-10 21:17:58 +01:00
Promofaux
107e0404de
Move exit 1
outside of if
block on verbose check to stop dnsmasq reloading
2016-04-08 23:01:13 +01:00
Promofaux
ab99e80333
indent
2016-04-08 23:00:46 +01:00
Promofaux
3154a378a6
Remove clear in DisplayWlist and force verbose to false to tidy up output.
2016-04-08 20:12:30 +01:00
Promofaux
8e04f1c03e
Remove clear in DisplayBlist and forse verbose to false to tidy up output.
2016-04-08 20:11:39 +01:00
Promofaux
c0aadeab3d
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:27 +01:00
Promofaux
6c87698f1a
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:10 +01:00
Justin Theberge
9a4c5cef86
fix indentations
2016-04-08 10:14:17 -04:00
Justin Theberge
bdfc86f850
fix formatting
2016-04-07 21:58:57 -04:00
Justin Theberge
70dadfba28
add list options requested from issue#442
2016-04-07 21:52:47 -04:00
Adam Warner
391dea445a
Move help output to function, add -h argument
2016-04-06 09:34:05 +01:00
Adam Warner
e074c72130
Move help output to function helpFunc, add -h argument.
2016-04-06 09:32:36 +01:00
Promofaux
9c94af04cc
Fixes #432 . Thanks to @VDRrulez and @jradwan for pointing it out...
2016-04-05 14:22:10 +01:00
Promofaux
849185d3c9
Fix incorrect echo
2016-04-05 00:03:49 +01:00
Promofaux
47cc757ed0
Fix incorrect echo
2016-04-05 00:03:24 +01:00
Promofaux
0bbfb323b1
make whitelist honour pihole.conf file
2016-04-04 21:08:56 +01:00
Promofaux
4f08359786
Make blacklist honour pihole.conf file
2016-04-04 21:08:45 +01:00
nate
7e06769d44
Double quoting
2016-04-04 01:03:05 -05:00
nate
5347ee4896
Write verbose status of processes to debug log & Minor UI Fixes
2016-04-04 00:59:24 -05:00
Promofaux
97d3aedba1
Add some output to the log flush
2016-04-03 18:27:18 +01:00
nate
7f9410fd34
Added uninstall option to bash-completion
2016-04-02 19:45:44 -05:00
nate
1a2046a7eb
Added uninstall option to pihole
command. Minor fixes
2016-04-02 19:20:54 -05:00
nate
6eea9239a7
Merged branch development into PiHoleController
2016-04-02 18:41:36 -05:00
Mcat12
e97755eb91
Fix missing cats
2016-04-02 19:28:30 -04:00
nate
d47fbbbe96
Mcat12 requests. Added bash-completion support
2016-04-02 17:58:10 -05:00
nate
b80821c4b7
Merged branch development into PiHoleController
2016-04-01 12:17:41 -05:00
nate
cf01b5a002
Readded cat
calls to fix permission issue
2016-04-01 12:17:05 -05:00
nate
bb66d559e7
Merge branch 'development'
...
Conflicts:
gravity.sh
2016-04-01 11:08:46 -05:00
nate
7b8fa3b922
Permissions changed for /etc/pihole and cleaned up some output
2016-04-01 01:11:59 -05:00
nate
28f2a1309e
Merge branch 'development'
...
Conflicts:
automated install/uninstall.sh
2016-03-31 20:25:54 -05:00
nate
2625d9f7fe
Made piholeDebug.sh +x
2016-03-30 20:09:19 -05:00
nate
5f7c11f495
Sudo added to ifconfig to ensure it runs if debug not run as root
2016-03-30 19:51:09 -05:00
nate
ec4d2d65a6
PromoFaux request: Detailed adlists.list output
...
Now tells user (and logs to pihole_Debug.log) that the adlists.default file is in use
2016-03-30 19:49:39 -05:00
nate
f8427ab789
Merge remote-tracking branch 'refs/remotes/pi-hole/development'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-29 12:57:22 -05:00
nate
fee55fa642
Added gravity.sh to the list of options
2016-03-28 18:37:49 -05:00
nate
76ea1962be
Controller script, pihole.sh added
...
Syntax changes for user output to be consistent
2016-03-28 18:31:21 -05:00
nate
f2150ee7e1
Merge conflict resolution
2016-03-28 13:07:51 -05:00
nate
2311b42bca
Merge branch 'ScriptCleanup-Dev'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/piholeDebug.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-28 12:58:44 -05:00
nate
a4fbccac9b
Merge conflict resolution
2016-03-28 12:53:21 -05:00
nate
a0cf93a7ca
Merge branch 'PiholeDebug'
...
Conflicts:
README.md
2016-03-28 12:22:42 -05:00
nate
8ef4c12f97
Merge branch 'ScriptCleanup'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-28 12:21:18 -05:00
nate
6145748bfb
Change single echo to printf to forrect \t interpretation
2016-03-27 20:36:31 -05:00