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