tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,933 Commits 8 Branches 109 Tags 31 MiB
Commit Graph

499 Commits

Author SHA1 Message Date
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