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
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
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
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
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
8c0f860601
Use systemctl/service calls instead of killall to restart/reload dnsmasq
2016-10-16 17:16:59 +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
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
Adam Warner