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 |
|