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
8ecf8eb76c
output to match other scripts
2016-01-24 17:18:37 +00:00
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
dfcf9d133e
Make output make a bit more sense
2016-01-24 16:46:00 +00:00
71fd32b1f4
script to set everything up
2016-01-23 12:56:27 -06:00
1e735c26c4
Repo Change QuickFix
...
QuickFix for Repo location change.
2016-01-22 20:46:10 -08:00
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
9ba38e668a
Merge pull request #193 from PromoFaux/Chronometer
...
Major overhaul of chronometer script
2016-01-18 17:36:33 -06:00
f665899116
Update chronometer.sh
...
weirdness
2016-01-18 23:35:21 +00:00
de464e17cc
Update chronometer.sh
...
Note to self, Find&Replace>Replace All is a bad idea.
2016-01-18 22:24:02 +00:00
0eed56380d
Update chronometer.sh
...
What, me? Reference the wrong file?
2016-01-18 22:15:39 +00:00
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
d77399727c
Merge pull request #189 from jacobsalmela/whitelist
...
Switched CRLF to LF (DOS to UNIX)
2016-01-17 18:34:02 -06:00
414ef54cfe
Switched CRLF to LF (DOS to UNIX)
2016-01-17 14:09:06 +00:00
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
f9a2ca5c32
Tidy up help text on both scripts. Add quiet help.
2016-01-16 00:47:45 +00:00
2b0bee085b
Incorrect reference to whitelist in the blacklist.sh comments :)
2016-01-15 18:57:20 +00:00
5d842a7533
Merging
2016-01-15 18:45:12 +00:00
f68cf10efa
Tidied up a couple of things
2016-01-15 15:54:00 +00:00
89e3c25a90
Behaves like whitelist, but on the blacklist
2016-01-15 15:53:40 +00:00
14ee4850af
Placeholder for blacklist script
2016-01-15 14:50:13 +00:00
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
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
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
cb91b8f5fa
Add copyright headers
2015-12-06 05:55:50 -08:00
831322b8b2
replace file paths with variables
2015-11-27 18:38:33 -06:00
573c1ef94f
double bracket notation
2015-11-27 18:34:02 -06:00
a2cddda590
if whitelist.txt doesn't exist, create it
2015-11-27 18:29:44 -06:00
a675dc3f2c
Merge pull request #68 from dschaper/hawson-reduce-memory
...
Hawson reduce memory
2015-11-06 16:50:37 -06:00
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
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
52ef76d717
missed a few more /etc/host changes
2015-07-30 18:10:26 +01:00
024395b73b
Update chronometer.sh
...
Missed a change todaysAdsEliminated to /\/etc\/pihole\/gravity.list/
2015-07-30 18:01:10 +01:00
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
9627b27f15
pihole logfile changes
...
https://github.com/jacobsalmela/pi-hole/pull/27
2015-07-29 12:22:28 +01:00
11614263b8
better version of LCD display stats
2015-07-25 13:05:13 -05:00
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
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
Dan Schaper
Daniel
bcambl
Mcat12
Carter Maxwell
Jim Liu
Mayur Raiturkar
Promofaux
Adam Warner
nate
Justin Theberge
Morlok8k
Adam Warner
jacobsalmela
Hippyjake
Dan Schaper
Nathan Jones
Fourdee
Dan
jacobsalmela