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
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
dcedf6bfd0
Merge branch 'development' into PromoFaux-patch-1
2016-09-19 20:54: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
8cb2f85a08
Replace `truncate` command with `echo " " >`
2016-09-02 16:39:34 +01:00
b3e7619048
curly brackets all the variables!
2016-08-21 02:12:02 +01: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
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
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
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
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
5347ee4896
Write verbose status of processes to debug log & Minor UI Fixes
2016-04-04 00:59:24 -05:00
97d3aedba1
Add some output to the log flush
2016-04-03 18:27:18 +01:00
1a2046a7eb
Added uninstall option to `pihole` command. Minor fixes
2016-04-02 19:20:54 -05:00
6eea9239a7
Merged branch development into PiHoleController
2016-04-02 18:41:36 -05:00
e97755eb91
Fix missing cats
2016-04-02 19:28:30 -04:00
b80821c4b7
Merged branch development into PiHoleController
2016-04-01 12:17:41 -05:00
cf01b5a002
Readded `cat` calls to fix permission issue
2016-04-01 12:17:05 -05:00
28f2a1309e
Merge branch 'development'
...
Conflicts:
automated install/uninstall.sh
2016-03-31 20:25:54 -05:00
2625d9f7fe
Made piholeDebug.sh +x
2016-03-30 20:09:19 -05:00
5f7c11f495
Sudo added to ifconfig to ensure it runs if debug not run as root
2016-03-30 19:51:09 -05:00
ec4d2d65a6
PromoFaux request: Detailed adlists.list output
...
Now tells user (and logs to pihole_Debug.log) that the adlists.default file is in use
2016-03-30 19:49:39 -05:00
fee55fa642
Added gravity.sh to the list of options
2016-03-28 18:37:49 -05:00
76ea1962be
Controller script, pihole.sh added
...
Syntax changes for user output to be consistent
2016-03-28 18:31:21 -05:00
f2150ee7e1
Merge conflict resolution
2016-03-28 13:07:51 -05:00
2311b42bca
Merge branch 'ScriptCleanup-Dev'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/piholeDebug.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-28 12:58:44 -05:00
a4fbccac9b
Merge conflict resolution
2016-03-28 12:53:21 -05:00
a0cf93a7ca
Merge branch 'PiholeDebug'
...
Conflicts:
README.md
2016-03-28 12:22:42 -05:00
8ef4c12f97
Merge branch 'ScriptCleanup'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-28 12:21:18 -05:00
6145748bfb
Change single echo to printf to forrect \t interpretation
2016-03-27 20:36:31 -05:00
1a1026b367
Consistent stdout to match basic-install.sh and uninstall.sh
2016-03-27 14:44:42 -05:00
5ee382c8eb
Roll back addition of piholeDebug.sh (production master base)
2016-03-26 17:00:52 -05:00
0b9e78df2c
Cleaned code and added prompt for purge on uninstall
2016-03-26 16:57:01 -05:00
a9c24b456d
Bug fixes and logging improvements
...
Finalized for production deployment. Next release targeting a tarball of config files plus additional logging.
2016-03-25 19:04:03 -05:00
b4463bf42c
Added test for nslookup
...
Checks the TESTURL for nslookup is not whitelisted
2016-03-25 16:42:17 -05:00
8f8dc66c70
Ignore whitespace when writing config files
2016-03-24 18:50:53 -05:00
b746250e71
Made all advanced/Scripts/ executable for consistency.
2016-03-24 18:29:13 -05:00
86eafe7a33
Added comparison of gravity.list with Whitelist.txt and Blacklist.txt.
...
Added additional echos to help read the debug file.
TODO: testNslookup function
2016-03-24 16:21:29 -05:00
04638c9065
Added 01-pihole.conf from /etc/dnsmasq.d/ to log
...
Write 01-pihole.conf to debug log
2016-03-20 18:21:35 -05:00
b0dd231018
Modified description in header
...
Removed copied header description from piholeLogFlush.sh and replaced with relevant description.
2016-03-19 21:34:02 -05:00
0b5f005a5d
Added piholeDebug.sh script for advanced debugging
...
Script piholeDebug.sh added to /usr/local/bin to generate a detailed log file for debugging/troubleshooting.
2016-03-19 20:32:11 -05:00
d13ae0610e
fix for older versions of uptime, on development branch.
2016-03-08 10:19:01 -08:00
ced0ae0d65
remove trailing whitespace whitelist.sh
2016-03-05 21:15:53 -08:00
876c51302a
remove trailing whitespace updateDashboard.sh
2016-03-05 21:15:36 -08:00
a6877e7c13
remove trailing whitespace chronometer.sh
2016-03-05 21:15:11 -08:00
f633d1fa5b
remove trailing whitespace blacklist.sh
2016-03-05 21:14:56 -08:00
3a46e7fc0a
Merge pull request #338 from pi-hole/auto-chronometer-lcd-setup
...
Auto chronometer lcd setup
2016-02-21 20:48:46 +00:00
0116b6341c
updated script
...
Added links to where code was borrowed from
added reboot at the end
also added a few things commented out that might be useful for some
people to learn.
2016-02-20 01:14:48 -06:00
f0e5b2b6f9
Merge branch 'master' into auto-chronometer-lcd-setup
2016-02-18 16:45:47 -06:00
21c688a8a8
add uptime -p to chrono script
2016-02-16 18:06:49 -07:00
3142992c57
update
2016-02-14 10:53:13 -06:00
4c24186911
Fixes divide by zero error.
2016-02-14 02:58:09 +00:00
48f9a61ff0
Updated License
2016-01-30 15:12:40 -05:00
754beed3a1
Bring up to date with master
2016-01-24 20:22:41 +00:00
Adam Warner
Dan Schaper
Adam Warner
Promofaux
Marcus Hildum
diginc
Dan Schaper
Sander
Daniel
bcambl
Mcat12
Carter Maxwell
Jim Liu
Mayur Raiturkar
nate
Justin Theberge
Morlok8k
jacobsalmela
Hippyjake