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
908697a963
User token instructions, and small bugfix for missing separator.
2016-10-29 12:04:18 -07:00
fad2d6b1d1
Return values start showin up now. Logic operators too...
2016-10-28 15:53:18 -07:00
9cd830b6aa
Start to refine tests and clean up code.
2016-10-28 15:37:45 -07:00
d9a16b0ff4
Clear up bottom half of script with fewer redundenicies.
2016-10-28 15:25:06 -07:00
cb5c94ef5e
Sorry, left that gravity.list parser in. Big debug files. Cleared that up.
2016-10-28 15:13:04 -07:00
85fbd66871
Good commit point, number of changes
2016-10-28 14:52:08 -07:00
3da75d6125
Grep was leaking a file not found if blacklist didn't exist
2016-10-28 17:28:04 -04:00
d4a3a5c180
Trying to implement The Brontide Idiom for design.
2016-10-28 10:42:30 -07:00
71e3a473d6
Fix = underbar
2016-10-28 07:16:16 -07:00
c2cfc09f63
Clean up more of the UX and log. Lots to go.
2016-10-28 07:06:05 -07:00
01f10b56e8
Refactor out some more reudndant code.
2016-10-28 06:51:30 -07:00
90ec0a610e
Tricorder is introduced.
2016-10-28 04:42:45 -07:00
42bff1ce1b
Move parse utility to be near other parsing functions.
2016-10-28 03:53:53 -07:00
e3c7a1f31f
Top half user output updated.
2016-10-28 03:49:03 -07:00
0debbffa70
Add a couple of parsing utility functions.
2016-10-28 03:45:07 -07:00
473b58d26d
Merge pull request #704 from stonedbovines/development
...
lighttpd.conf templates change
2016-10-27 20:22:46 -05:00
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
21fc6344bf
Merge pull request #849 from pi-hole/aManHasNoNameResolution
...
[BugFix] A man has no name resolution
2016-10-27 19:41:07 +01:00
f9570a82cc
Remove glitchy daemon detection.
2016-10-27 00:58:24 -07:00
36285ead57
Just becuase this is bugging me, but I'll fix it later.
2016-10-27 00:32:18 -07:00
13e488dace
Daemon check for lighttpd and dnsmasq.
2016-10-27 00:30:51 -07:00
f169da8fd0
Set for quiet temporarily.
2016-10-26 14:48:11 -07:00
60741298b7
Cut more verbosity. Prep for `lsof` parsing and daemon tests.
2016-10-26 14:33:47 -07:00
f73734acb0
Only check IPv6 Gateway if it exists.
2016-10-26 13:57:57 -07:00
fc360abe43
Only check IPv6 if system is enabled.
2016-10-26 12:22:20 -07:00
3996e11425
Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist
...
Improvements to White and Blacklists
2016-10-26 19:52:16 +01:00
98db002770
Tighten IP test reponse to user.
2016-10-26 11:38:19 -07:00
f1c1caf7bd
url.rewrite does not work in $HTTP block lighttpd bug #2526
2016-10-26 11:49:42 -04:00
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
0d6a6b97f9
remove whitelist and blacklist scripts
2016-10-26 09:56:45 +01:00
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
4269626f5d
Attribute source for bashism.
2016-10-25 21:53:41 -07:00
8fa897aadb
Add back in sourcing files (setupVars.conf) and tweak `ip_check`
2016-10-25 21:39:28 -07:00
f549618d12
Move environment IPv6 interface check to `ip_check` and fix IPv6 source routing issue.
2016-10-25 21:25:57 -07:00
2fa47aaf31
Source routing is deprecated by RFC5095
2016-10-25 20:53:18 -07:00
b0874fb23a
Temporarily get rid of gateway sourcing from setupVars, temporarily.
2016-10-25 19:53:00 -07:00
fb70fd77e8
Prototype version_check, add helper functions for logging and echo.
2016-10-25 17:50:14 -07:00
01f17f9cbb
Reduce header verbosity. New header writer.
2016-10-25 17:19:33 -07:00
18005ceee8
add hostname lines in 01-pihole.conf
2016-10-25 15:03:49 +01:00
eb52f81a5c
add pi.hole entries to 01-pihole.conf
2016-10-25 14:54:10 +01:00
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
b49384ffe4
intent
2016-10-23 22:44:21 +01:00
7fb622638b
flip reload logic. Do not reload if there are not changes made to blacklist.txt
2016-10-23 22:44:06 +01:00
bd0cc134bf
MERGE FAIL :ashamed_face:
2016-10-23 22:43:11 +01:00
476fd1f695
indentation
2016-10-23 22:38:18 +01:00
96053d13be
Flip reload logic. Do not reload lists if no changes made to whitelist.txt
2016-10-23 22:38:06 +01:00
c958bed418
Consistency changes. Replace MOST uses of `echo >> ${DebugLog}` with usage of `log_write` function
2016-10-23 22:31:20 +01:00
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
b79392ba2c
exit after displaying white/blacklist
2016-10-23 19:49:51 +01:00
d0826b2c33
Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
2016-10-23 19:33:28 +01:00
5d6072524c
Consistency
...
Missed one
2016-10-22 10:26:00 -07:00
07a66a70fc
Consistency
...
More of the same
2016-10-22 10:12:05 -07:00
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
a30c75ef71
Consistency
...
Cleanup!
2016-10-22 00:35:44 -07:00
d0b3727c5d
Consistency
...
Yet more cleanup
2016-10-22 00:32:36 -07:00
6e94bf5b6d
Consistency
...
You know the drill
2016-10-22 00:14:38 -07:00
0f04e270a7
consistency
...
Just more cleanup
2016-10-22 00:10:25 -07:00
44a36368a2
Merge pull request #822 from pi-hole/ChangeWarning
...
Add file change warning to header
2016-10-21 11:24:12 +01:00
c0012540ed
Re-add shebang
2016-10-20 21:08:07 +01:00
9ab6df0e54
Merge branch 'development' into promoTweaksTheSecond
...
# Conflicts:
# advanced/Scripts/blacklist.sh
# advanced/Scripts/whitelist.sh
2016-10-20 21:06:28 +01:00
3623183072
Remove reference to non-existent script
2016-10-20 13:29:12 +01:00
e6bd979aeb
Can't spell
...
Fix spelling error
2016-10-20 04:27:12 -07:00
b5b6350cc7
Add file change warning to header
2016-10-20 03:42:25 -07:00
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
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
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
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
b66f23cfd0
account for new update script
2016-10-18 14:19:44 +01:00
27d6e5d8cf
Complete overhaul of update logic. Moved to seperate script
2016-10-18 14:19:25 +01:00
ce46c4dec4
remove prematurely added code
2016-10-18 12:11:02 +01:00
013d77488a
complete overhaul of version script. Now with optional arguments!
2016-10-18 12:07:11 +01:00
29ad2496b6
don't output "elevating with sudo" in pihole script, just do it.
2016-10-18 12:05:48 +01:00
97a013b2b7
Add direction to change upstream servers in setupVars.conf
2016-10-18 10:35:22 +01:00
77808223dc
remove stock comments from 01-pihole.conf and add warning to the top
2016-10-18 10:05:10 +01:00
8c0f860601
Use systemctl/service calls instead of killall to restart/reload dnsmasq
2016-10-16 17:16:59 +01:00
7e10dcdcf0
update pihole bash-completion
2016-10-15 20:12:16 +01:00
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
28ef8068c8
add mimetype for .svg
...
Chrome does not display .svg-images without the correct mimetype
2016-10-05 01:20:30 +02:00
9a421d510a
Ignore comments in adlists.list section.
2016-10-01 13:16:58 -07:00
a9c3e2c7ba
Add log_write function. Update version_check to use logical conditionals.
2016-09-28 13:09:38 -07:00
7fcb40739d
Close IF statement
2016-09-28 10:25:37 -07:00
5a3d319677
Add fail check to dig local and remote.
2016-09-28 10:24:44 -07:00
8466d0b681
Change NSLOOKUP to dig for resolver tests, add dnsmasq specific records check
2016-09-28 10:14:47 -07:00
5de179f1eb
Remove blacklist comparison.
2016-09-28 09:52:11 -07:00
36e10595cc
Change netstat to lsof.
2016-09-28 09:51:14 -07:00
edd7f28104
Add internet checks to IP section
2016-09-27 19:39:28 -07:00
dba1ab3fc0
Remove compareWhitelist
2016-09-27 19:31:21 -07:00
3df9c48012
Include ping statistics in default gateway checks.
2016-09-27 19:30:37 -07:00
ac1c299369
Revert overzealous renaming of Pi-hole in pihole.log detection.
2016-09-26 20:54:05 -07:00
5bbb3ac49a
Standardize Pi-hole naming.
2016-09-26 20:50:03 -07:00
014bdf911a
Add open port detection
2016-09-26 20:39:39 -07:00
874853fe18
Add lighttpd to version check
2016-09-26 19:23:30 -07:00
274b71f8bc
Relocate hostname checks
2016-09-26 18:52:12 -07:00
c41d543d81
Handle lack of IPv6 gracefully.
2016-09-26 18:27:02 -07:00
7729ddab30
Mode code realignment. Handle lack of IPv6 gateway gracefully.
2016-09-26 18:21:58 -07:00
60c0e59a83
Add IPv6 intelligence to debug
2016-09-26 18:06:31 -07:00
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
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
dcedf6bfd0
Merge branch 'development' into PromoFaux-patch-1
2016-09-19 20:54:04 +01:00
DL6ER
Mcat12
Dan Schaper
Adam Warner
Jacob Salmela
Dan Schaper
Adam Warner
Promofaux
Dan Schaper
diginc
Eric Warnke
Marcus Hildum
Jakob Ackermann
Steve Dobinson