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
3d5140458b
Change cron job
2016-09-19 20:43:04 +01:00
b1a7b0a186
Update piholeDebug.sh
...
I can spell, honest.
2016-09-15 15:16:06 +01:00
a3ef9efd2f
remove updateDashboard script
2016-09-12 19:09:19 +01:00
95ee3216c4
Add the newer pihole command tags to the bash auto complete!
2016-09-06 21:57:17 +01:00
eb201b614a
Change log flush time to 00:00
2016-09-06 19:29:30 +01:00
8cb2f85a08
Replace `truncate` command with `echo " " >`
2016-09-02 16:39:34 +01:00
01a9534729
Merge branch 'development' into UpdateMethod
...
# Conflicts:
# automated install/basic-install.sh
2016-08-30 19:32:40 +01:00
b3e7619048
curly brackets all the variables!
2016-08-21 02:12:02 +01:00
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
95edb49bb8
Add option for uploading debug log to termbin
2016-08-05 12:47:57 +01:00
e11ef5a7f0
Add version display script. Also checks current version on web and reports version.
2016-08-02 20:07:09 +01:00
5fb6c5b012
Making the whitelist re-block echo consistent with other WL/BL echos
2016-07-20 12:53:31 -05:00
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
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
61ff12e8d4
Change header to match the rest of the scripts.
2016-07-15 21:17:16 +01:00
e942440bb7
Dan forgot this : `}`
2016-07-15 21:11:10 +01:00
6f068e0b9c
Replace sprunge.us with termbin, which appears to be more reliable.
2016-07-15 19:32:49 +01:00
11f2524b9b
Instead of an or, cat *release
2016-07-14 20:47:27 +02:00
b011e5f838
Add os-release check
2016-07-14 11:35:52 -07:00
f45eb84d6b
Add distribution Check
2016-07-14 11:27:47 -07:00
9b8efe1b27
Upload log to sprunge.us
2016-07-03 19:50:42 -04:00
27a9642090
check for sudo via 'command -v' instead of dkpg-query
2016-06-11 15:58:49 -06:00
376eb81181
SELinux Support
2016-06-11 15:58:49 -06:00
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
62fa9c0f6e
fixing whitespace
2016-06-11 15:58:48 -06:00
6f2117d786
append '.debian' to lighttpd.conf for compatability
2016-06-11 15:58:48 -06:00
d67957d015
add fedora lighttpd.conf template
2016-06-11 15:58:48 -06:00
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
3fda2d9ac3
Fix helpfunc not found error
2016-05-25 17:07:12 -04:00
c0e1772e21
Replace toilet with echo
2016-05-07 11:44:18 -07:00
f03303e5aa
Add X-Pi-hole header
2016-05-03 11:58:13 -04:00
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
08e6f60941
Update blacklist.sh
2016-04-22 01:42:43 +08:00
10066209e7
Update whitelist.sh
...
Change piholeIPfile to a permanent location.
2016-04-22 01:41:11 +08:00
81fdfcba22
Update whitelist.sh
2016-04-21 23:40:38 +08:00
619082dbed
Merge branch 'development' into BugFix463
...
Conflicts:
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
2016-04-20 15:54:58 -04:00
d7abbbfac4
Change mode of sudoer file
2016-04-17 22:49:47 -04:00
c714196647
Add Sudoer file for WebUI
2016-04-17 22:46:06 -04:00
56ac04c48e
fixed helpFunc 2
2016-04-17 18:22:06 +05:30
b58519b974
fixed helpFunc 1
2016-04-17 18:21:32 +05:30
ad574f5e90
Replace kill with killall
2016-04-16 15:52:38 +01:00
4941a657bf
remove -s switch, as it turns out it worked afterall.
2016-04-16 12:59:40 +01:00
3d4bff9414
Add -s switch to kill command to increase compatability
2016-04-16 10:56:49 +01:00
77f4126f9b
add root check to whitelist script
2016-04-13 15:51:48 +01:00
4c890ab202
Add root check to blacklist script
2016-04-13 15:50:48 +01:00
d10e9b1b6e
add pihole/webui version numbers
2016-04-12 08:47:30 +01:00
a6bee76581
add location of debug log output file!
2016-04-12 08:24:34 +01:00
2f4f5a6ad2
Added lighttpd error.log to debug output
2016-04-11 18:35:44 -05:00
48fa83c9ac
Fix whitespace
2016-04-10 21:36:33 +01:00
05e0003555
Fixes issue #453
2016-04-10 21:17:58 +01:00
107e0404de
Move `exit 1` outside of `if` block on verbose check to stop dnsmasq reloading
2016-04-08 23:01:13 +01:00
ab99e80333
indent
2016-04-08 23:00:46 +01:00
3154a378a6
Remove clear in DisplayWlist and force verbose to false to tidy up output.
2016-04-08 20:12:30 +01:00
8e04f1c03e
Remove clear in DisplayBlist and forse verbose to false to tidy up output.
2016-04-08 20:11:39 +01:00
c0aadeab3d
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:27 +01:00
6c87698f1a
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:10 +01:00
9a4c5cef86
fix indentations
2016-04-08 10:14:17 -04:00
bdfc86f850
fix formatting
2016-04-07 21:58:57 -04:00
70dadfba28
add list options requested from issue#442
2016-04-07 21:52:47 -04:00
391dea445a
Move help output to function, add -h argument
2016-04-06 09:34:05 +01:00
e074c72130
Move help output to function helpFunc, add -h argument.
2016-04-06 09:32:36 +01:00
9c94af04cc
Fixes #432 . Thanks to @VDRrulez and @jradwan for pointing it out...
2016-04-05 14:22:10 +01:00
849185d3c9
Fix incorrect echo
2016-04-05 00:03:49 +01:00
47cc757ed0
Fix incorrect echo
2016-04-05 00:03:24 +01:00
0bbfb323b1
make whitelist honour pihole.conf file
2016-04-04 21:08:56 +01:00
4f08359786
Make blacklist honour pihole.conf file
2016-04-04 21:08:45 +01:00
7e06769d44
Double quoting
2016-04-04 01:03:05 -05:00
Dan Schaper
Adam Warner
Dan Schaper
Eric Warnke
Adam Warner
Promofaux
Marcus Hildum
Jakob Ackermann
Steve Dobinson
Victor Marquez
diginc
Sander
Daniel
bcambl
Mcat12
Carter Maxwell
Jim Liu
Mayur Raiturkar
nate
Justin Theberge