Promofaux
dfcf9d133e
Make output make a bit more sense
2016-01-24 16:46:00 +00:00
Dan Schaper
494fcd60ab
Merge branch 'development' of https://github.com/jacobsalmela/pi-hole into development
2016-01-20 05:25:49 +00:00
Mcat12
544919175c
Added back in debugging response header
2016-01-20 05:23:30 +00:00
Mcat12
ede8f4714f
Removed extra http redirect
2016-01-20 05:23:15 +00: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
5d608a2db5
leave system cron alone
...
Taking JoshKastang’s idea from #153 , the system cron file will be left
alone and the pihole.cron gets its own.
2016-01-16 13:48:29 -06: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
jacobsalmela
ca5e34a9a9
Merge branch 'master' into whitelist
...
# Conflicts:
# gravity.sh
2016-01-14 18:12:45 -06:00
Jacob Salmela
4b1dd8a2a5
fixes #158
...
Running at midnight, not 11:58 in the afternoon.
2016-01-12 17:44:08 -06: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
d215fa9ade
Resolve merge confict
2015-12-06 20:22:34 -08:00
Dan Schaper
cb91b8f5fa
Add copyright headers
2015-12-06 05:55:50 -08:00
Jacob Salmela
f453d407a9
log-async
...
For better performance. I have been using it for a few weeks with no
adverse effects.
2015-12-05 14:14:34 -06:00
Jacob Salmela
49a40115c8
fixes #105
2015-12-05 14:04:37 -06:00
Dan Schaper
2193d6a81f
Document dnsmasq.conf config
2015-12-03 01:29:26 -08:00
Jacob Salmela
c34cc1608b
for use with logstalgia
...
This seems to show the domain queried and the path requested.
2015-12-01 16:04:07 -06:00
Jacob Salmela
1eb7f879f0
fixes #101
...
the line url.access-deny caused the error.
2015-12-01 15:12:16 -06: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
ce0ca3cc61
for use with /etc/crontab
...
Adding a system-wide crontab to update the ad source lists, flush the
log daily, and (eventually) record the stats for historical purposes.
2015-11-07 07:58:35 -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
Jacob Salmela
271163ed66
Merge pull request #61 from nathanpjones/improve-whitelist-script
...
Improve whitelisting script
2015-11-04 20:35:42 -06:00
Jacob Salmela
2f9e650739
Merge pull request #62 from jacobsalmela/lighttpd
...
New lighttpd.conf. Closes #31 and #50
2015-10-27 17:26:45 -05: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
Jacob Salmela
17904b3106
ads still get blocked when a 404 happens
2015-10-17 12:12:51 -05:00
Jacob Salmela
7b16a42f31
conditionals for accessing the web interface
...
This adds in some back end improvements for better debugging. It also
allows you to access the Web interface, while you are connected to the
Pi-hole, which resolves #31
2015-10-17 12:11:03 -05:00
Jacob Salmela
28dd956449
changing web server root folder
...
Since the version of lighted in Jessie moved the default folder to
/var/www/html, I am going to make it the same for wheezy for better
compatibility.
Also removed spaces
2015-10-17 12:04:49 -05:00
Jacob Salmela
bf397db73e
adding crontab file
...
I plan to use this to be deployed with the automatic installer. Just
pushing the file for now so I can test download it.
2015-10-15 18:58:12 -05:00
jacobsalmela
d68c262b96
swap file to eliminate memory allocation error
2015-08-24 16:30:00 -05: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
Jacob Salmela
2d96f005e6
Merge pull request #28 from Fourdee/patch-2
...
Adjusting chronomiter.sh to use the new /var/log/pihole.log
2015-07-29 18:02:29 -05:00
