Dan Schaper
014bdf911a
Add open port detection
2016-09-26 20:39:39 -07:00
Dan Schaper
874853fe18
Add lighttpd to version check
2016-09-26 19:23:30 -07:00
Dan Schaper
274b71f8bc
Relocate hostname checks
2016-09-26 18:52:12 -07:00
Dan Schaper
c41d543d81
Handle lack of IPv6 gracefully.
2016-09-26 18:27:02 -07:00
Dan Schaper
7729ddab30
Mode code realignment. Handle lack of IPv6 gateway gracefully.
2016-09-26 18:21:58 -07:00
Dan Schaper
60c0e59a83
Add IPv6 intelligence to debug
2016-09-26 18:06:31 -07:00
Adam Warner
dcedf6bfd0
Merge branch 'development' into PromoFaux-patch-1
2016-09-19 20:54:04 +01:00
Adam Warner
b1a7b0a186
Update piholeDebug.sh
...
I can spell, honest.
2016-09-15 15:16:06 +01:00
Promofaux
a3ef9efd2f
remove updateDashboard script
2016-09-12 19:09:19 +01:00
Adam Warner
8cb2f85a08
Replace truncate command with echo " " >
2016-09-02 16:39:34 +01:00
Promofaux
b3e7619048
curly brackets all the variables!
2016-08-21 02:12:02 +01:00
Adam Warner
95edb49bb8
Add option for uploading debug log to termbin
2016-08-05 12:47:57 +01:00
Promofaux
e11ef5a7f0
Add version display script. Also checks current version on web and reports version.
2016-08-02 20:07:09 +01:00
diginc
5fb6c5b012
Making the whitelist re-block echo consistent with other WL/BL echos
2016-07-20 12:53:31 -05:00
diginc
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
Dan Schaper
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
Promofaux
61ff12e8d4
Change header to match the rest of the scripts.
2016-07-15 21:17:16 +01:00
Promofaux
e942440bb7
Dan forgot this : }
2016-07-15 21:11:10 +01:00
Promofaux
6f068e0b9c
Replace sprunge.us with termbin, which appears to be more reliable.
2016-07-15 19:32:49 +01:00
Sander
11f2524b9b
Instead of an or, cat *release
2016-07-14 20:47:27 +02:00
Dan Schaper
b011e5f838
Add os-release check
2016-07-14 11:35:52 -07:00
Dan Schaper
f45eb84d6b
Add distribution Check
2016-07-14 11:27:47 -07:00
Daniel
9b8efe1b27
Upload log to sprunge.us
2016-07-03 19:50:42 -04:00
bcambl
27a9642090
check for sudo via 'command -v' instead of dkpg-query
2016-06-11 15:58:49 -06:00
Mcat12
3fda2d9ac3
Fix helpfunc not found error
2016-05-25 17:07:12 -04:00
Carter Maxwell
c0e1772e21
Replace toilet with echo
2016-05-07 11:44:18 -07:00
Jim Liu
08e6f60941
Update blacklist.sh
2016-04-22 01:42:43 +08:00
Jim Liu
10066209e7
Update whitelist.sh
...
Change piholeIPfile to a permanent location.
2016-04-22 01:41:11 +08:00
Jim Liu
81fdfcba22
Update whitelist.sh
2016-04-21 23:40:38 +08:00
Mcat12
619082dbed
Merge branch 'development' into BugFix463
...
Conflicts:
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
2016-04-20 15:54:58 -04:00
Mayur Raiturkar
56ac04c48e
fixed helpFunc 2
2016-04-17 18:22:06 +05:30
Mayur Raiturkar
b58519b974
fixed helpFunc 1
2016-04-17 18:21:32 +05:30
Promofaux
ad574f5e90
Replace kill with killall
2016-04-16 15:52:38 +01:00
Promofaux
4941a657bf
remove -s switch, as it turns out it worked afterall.
2016-04-16 12:59:40 +01:00
Promofaux
3d4bff9414
Add -s switch to kill command to increase compatability
2016-04-16 10:56:49 +01:00
Adam Warner
77f4126f9b
add root check to whitelist script
2016-04-13 15:51:48 +01:00
Adam Warner
4c890ab202
Add root check to blacklist script
2016-04-13 15:50:48 +01:00
Adam Warner
d10e9b1b6e
add pihole/webui version numbers
2016-04-12 08:47:30 +01:00
Adam Warner
a6bee76581
add location of debug log output file!
2016-04-12 08:24:34 +01:00
nate
2f4f5a6ad2
Added lighttpd error.log to debug output
2016-04-11 18:35:44 -05:00
Promofaux
48fa83c9ac
Fix whitespace
2016-04-10 21:36:33 +01:00
Promofaux
05e0003555
Fixes issue #453
2016-04-10 21:17:58 +01:00
Promofaux
107e0404de
Move exit 1 outside of if block on verbose check to stop dnsmasq reloading
2016-04-08 23:01:13 +01:00
Promofaux
ab99e80333
indent
2016-04-08 23:00:46 +01:00
Promofaux
3154a378a6
Remove clear in DisplayWlist and force verbose to false to tidy up output.
2016-04-08 20:12:30 +01:00
Promofaux
8e04f1c03e
Remove clear in DisplayBlist and forse verbose to false to tidy up output.
2016-04-08 20:11:39 +01:00
Promofaux
c0aadeab3d
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:27 +01:00
Promofaux
6c87698f1a
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:10 +01:00
Justin Theberge
9a4c5cef86
fix indentations
2016-04-08 10:14:17 -04:00
Justin Theberge
bdfc86f850
fix formatting
2016-04-07 21:58:57 -04:00
Justin Theberge
70dadfba28
add list options requested from issue#442
2016-04-07 21:52:47 -04:00
Adam Warner
391dea445a
Move help output to function, add -h argument
2016-04-06 09:34:05 +01:00
Adam Warner
e074c72130
Move help output to function helpFunc, add -h argument.
2016-04-06 09:32:36 +01:00
Promofaux
849185d3c9
Fix incorrect echo
2016-04-05 00:03:49 +01:00
Promofaux
47cc757ed0
Fix incorrect echo
2016-04-05 00:03:24 +01:00
Promofaux
0bbfb323b1
make whitelist honour pihole.conf file
2016-04-04 21:08:56 +01:00
Promofaux
4f08359786
Make blacklist honour pihole.conf file
2016-04-04 21:08:45 +01:00
nate
7e06769d44
Double quoting
2016-04-04 01:03:05 -05:00
nate
5347ee4896
Write verbose status of processes to debug log & Minor UI Fixes
2016-04-04 00:59:24 -05:00
Promofaux
97d3aedba1
Add some output to the log flush
2016-04-03 18:27:18 +01:00
nate
1a2046a7eb
Added uninstall option to pihole command. Minor fixes
2016-04-02 19:20:54 -05:00
nate
6eea9239a7
Merged branch development into PiHoleController
2016-04-02 18:41:36 -05:00
Mcat12
e97755eb91
Fix missing cats
2016-04-02 19:28:30 -04:00
nate
b80821c4b7
Merged branch development into PiHoleController
2016-04-01 12:17:41 -05:00
nate
cf01b5a002
Readded cat calls to fix permission issue
2016-04-01 12:17:05 -05:00
nate
28f2a1309e
Merge branch 'development'
...
Conflicts:
automated install/uninstall.sh
2016-03-31 20:25:54 -05:00
nate
2625d9f7fe
Made piholeDebug.sh +x
2016-03-30 20:09:19 -05:00
nate
5f7c11f495
Sudo added to ifconfig to ensure it runs if debug not run as root
2016-03-30 19:51:09 -05:00
nate
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
nate
fee55fa642
Added gravity.sh to the list of options
2016-03-28 18:37:49 -05:00
nate
76ea1962be
Controller script, pihole.sh added
...
Syntax changes for user output to be consistent
2016-03-28 18:31:21 -05:00
nate
f2150ee7e1
Merge conflict resolution
2016-03-28 13:07:51 -05:00
nate
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
nate
a4fbccac9b
Merge conflict resolution
2016-03-28 12:53:21 -05:00
nate
a0cf93a7ca
Merge branch 'PiholeDebug'
...
Conflicts:
README.md
2016-03-28 12:22:42 -05:00
nate
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
nate
6145748bfb
Change single echo to printf to forrect \t interpretation
2016-03-27 20:36:31 -05:00
nate
1a1026b367
Consistent stdout to match basic-install.sh and uninstall.sh
2016-03-27 14:44:42 -05:00
nate
5ee382c8eb
Roll back addition of piholeDebug.sh (production master base)
2016-03-26 17:00:52 -05:00
nate
0b9e78df2c
Cleaned code and added prompt for purge on uninstall
2016-03-26 16:57:01 -05:00
nate
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
nate
b4463bf42c
Added test for nslookup
...
Checks the TESTURL for nslookup is not whitelisted
2016-03-25 16:42:17 -05:00
nate
8f8dc66c70
Ignore whitespace when writing config files
2016-03-24 18:50:53 -05:00
Nate
b746250e71
Made all advanced/Scripts/ executable for consistency.
2016-03-24 18:29:13 -05:00
nate
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
nate
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
nate
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
nate
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
Morlok8k
d13ae0610e
fix for older versions of uptime, on development branch.
2016-03-08 10:19:01 -08:00
Carter Maxwell
ced0ae0d65
remove trailing whitespace whitelist.sh
2016-03-05 21:15:53 -08:00
Carter Maxwell
876c51302a
remove trailing whitespace updateDashboard.sh
2016-03-05 21:15:36 -08:00
Carter Maxwell
a6877e7c13
remove trailing whitespace chronometer.sh
2016-03-05 21:15:11 -08:00
Carter Maxwell
f633d1fa5b
remove trailing whitespace blacklist.sh
2016-03-05 21:14:56 -08:00
Adam Warner
3a46e7fc0a
Merge pull request #338 from pi-hole/auto-chronometer-lcd-setup
...
Auto chronometer lcd setup
2016-02-21 20:48:46 +00:00
jacobsalmela
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
jacobsalmela
f0e5b2b6f9
Merge branch 'master' into auto-chronometer-lcd-setup
2016-02-18 16:45:47 -06:00
Hippyjake
21c688a8a8
add uptime -p to chrono script
2016-02-16 18:06:49 -07:00
jacobsalmela
3142992c57
update
2016-02-14 10:53:13 -06:00
Promofaux
4c24186911
Fixes divide by zero error.
2016-02-14 02:58:09 +00:00
Mcat12
48f9a61ff0
Updated License
2016-01-30 15:12:40 -05:00
Promofaux
754beed3a1
Bring up to date with master
2016-01-24 20:22:41 +00:00
Promofaux
8ecf8eb76c
output to match other scripts
2016-01-24 17:18:37 +00:00
Promofaux
3cd1a5b1d5
... Helps if I add the changes to the repo file, and not the test file on my pi.
2016-01-24 16:51:54 +00:00
Promofaux
dfcf9d133e
Make output make a bit more sense
2016-01-24 16:46:00 +00:00
jacobsalmela
71fd32b1f4
script to set everything up
2016-01-23 12:56:27 -06:00
Dan Schaper
1e735c26c4
Repo Change QuickFix
...
QuickFix for Repo location change.
2016-01-22 20:46:10 -08:00
Promofaux
af982a02af
Move call to CheckIPv6 function into CalcBlockedDomains, rather than relying on remembering to call it before you call CalcBlockedDomains.
2016-01-19 21:14:01 +00:00
Jacob Salmela
9ba38e668a
Merge pull request #193 from PromoFaux/Chronometer
...
Major overhaul of chronometer script
2016-01-18 17:36:33 -06:00
Adam Warner
f665899116
Update chronometer.sh
...
weirdness
2016-01-18 23:35:21 +00:00
Adam Warner
de464e17cc
Update chronometer.sh
...
Note to self, Find&Replace>Replace All is a bad idea.
2016-01-18 22:24:02 +00:00
Adam Warner
0eed56380d
Update chronometer.sh
...
What, me? Reference the wrong file?
2016-01-18 22:15:39 +00:00
Promofaux
487c26db44
Major overhaul. Added -j option to output stats as JSON formatted string. If run with no option, then chronometer runs as normal. Fixed calculations to match those on the web dashboard.
2016-01-18 22:03:53 +00:00
Jacob Salmela
d77399727c
Merge pull request #189 from jacobsalmela/whitelist
...
Switched CRLF to LF (DOS to UNIX)
2016-01-17 18:34:02 -06:00
Promofaux
414ef54cfe
Switched CRLF to LF (DOS to UNIX)
2016-01-17 14:09:06 +00:00
jacobsalmela
bd5ed2bcf0
move webinterface.sh into scripts folder
...
I also renamed it to make it is easier to identify.
2016-01-16 13:12:55 -06:00
Promofaux
f9a2ca5c32
Tidy up help text on both scripts. Add quiet help.
2016-01-16 00:47:45 +00:00
Adam Warner
2b0bee085b
Incorrect reference to whitelist in the blacklist.sh comments :)
2016-01-15 18:57:20 +00:00
Adam Warner
5d842a7533
Merging
2016-01-15 18:45:12 +00:00
Adam Warner
f68cf10efa
Tidied up a couple of things
2016-01-15 15:54:00 +00:00
Adam Warner
89e3c25a90
Behaves like whitelist, but on the blacklist
2016-01-15 15:53:40 +00:00
Adam Warner
14ee4850af
Placeholder for blacklist script
2016-01-15 14:50:13 +00:00
Adam Warner
534dbc9b6e
added a quiet option for when the script is called by gravity. Less output = less confusion!
2016-01-15 14:48:07 +00:00
Adam Warner
8ad116fe7b
Aiming to get whitelist.sh to run either standalone or to be called from gravity.sh. Initial commit
2016-01-15 14:17:55 +00:00
Jacob Salmela
57282cfe16
ugly hack to whitelist from the Web interface
...
I wanted the whitelist feature to keep the user on the same page
without having to reload it. I'm sure someone better versed in PHP
could eliminate the need for this hack. Nonetheless, it works.
www-data runs the script if executed from the Web interface. www-data
also needs access to write to /etc/pihole/gravity.list to actually
remove the domain. So a few more things need to happen before this
will fully work.
The changes in this script won't change what is displayed if run from
the terminal, but will help when it needs to be run from the Web
interface, so I am just committing this now.
The only other thing I would like to see would be a progress spinner,
but my Web skills still need some work...
2015-12-09 15:16:34 -06:00
Dan Schaper
cb91b8f5fa
Add copyright headers
2015-12-06 05:55:50 -08:00
Jacob Salmela
831322b8b2
replace file paths with variables
2015-11-27 18:38:33 -06:00
Jacob Salmela
573c1ef94f
double bracket notation
2015-11-27 18:34:02 -06:00
Jacob Salmela
a2cddda590
if whitelist.txt doesn't exist, create it
2015-11-27 18:29:44 -06:00
Jacob Salmela
a675dc3f2c
Merge pull request #68 from dschaper/hawson-reduce-memory
...
Hawson reduce memory
2015-11-06 16:50:37 -06:00
Jacob Salmela
1b51b9ade3
for use as a cron job
...
The log will be flushed daily and stats will be stored in a DB for
displaying on the Web interface.
2015-11-05 14:31:38 -06:00
Nathan Jones
deb48c124f
Improve whitelisting script
...
Match domain exactly instead of partially.
Gather list of domains to minimize number of times that hosts file must be enumerated.
Only add domain to whitelist if it isn't already present.
2015-10-25 16:53:20 -07:00
Fourdee
52ef76d717
missed a few more /etc/host changes
2015-07-30 18:10:26 +01:00
Dan
024395b73b
Update chronometer.sh
...
Missed a change todaysAdsEliminated to /\/etc\/pihole\/gravity.list/
2015-07-30 18:01:10 +01:00
Fourdee
9d99a4ef36
Patch 3 - Dont use /etc/hosts
...
/etc/pihole/gravity.list now stores the block list. Ensures the
/etc/hosts file is left untouched.
2015-07-30 17:24:24 +01:00
Dan
9627b27f15
pihole logfile changes
...
https://github.com/jacobsalmela/pi-hole/pull/27
2015-07-29 12:22:28 +01:00
jacobsalmela
11614263b8
better version of LCD display stats
2015-07-25 13:05:13 -05:00
jacobsalmela
9a2862de62
closes #24 whitelist without running gravity.sh
...
It's pretty slow because /etc/hosts is so large, but it works. You can
add any number of domains as arguments and it will search for and
remove each one.
Maybe someone smarter knows how to make it faster...
2015-07-18 09:39:18 -05:00
jacobsalmela
fd2b24f2a0
preparing files for merge and for testing automated install
...
I haven't merged anything before, so hopefully, I won't mess it up too
bad!
2015-06-16 11:15:15 -05:00
