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
c5d45edf2d
consoleblank=0
...
This makes sure the LCD screen does not go blank after a set period of
time.
2016-02-20 01:15:14 -06: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
Promofaux
70e4104c17
Merge remote-tracking branch 'origin/development'
2016-01-31 20:47:10 +00:00
Mcat12
48f9a61ff0
Updated License
2016-01-30 15:12:40 -05:00
Chad Howell
abef758ff6
Get ready for user selected DNSs
...
Prep for using sed to insert user selected DNSs into 01-pihole.conf.
Selections will come from dialog during install script containing the
following choices: Google, DynDNS, and eventually 2 custom DNS servers.
2016-01-25 00:05:17 -05:00
Chad Howell
e5f9663a0e
Move dnsmasq.conf to dnsmasq.d/01-pihole.conf
...
Check if /etc/dnsmasq.conf is from pihole. If so, replace with an
original and install new in .d directory. Add and unmolested version of
dnsmasq.conf to the ./advanced directory.
2016-01-25 00:04:02 -05:00
Chad Howell
ff5ed561cc
Rename dnsmasq.conf to 01-pihole.conf
...
Rename dnsmasq.conf to 01-pihole.conf to prepare for move to
/etc/dnsmasq.d/ per the normal way of modding configs on Debian based
systems.
2016-01-24 23:54:00 -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
jacobsalmela
fcf3b4e4e2
file to set lcd font size
2016-01-23 11:48:12 -06:00
Dan Schaper
1e735c26c4
Repo Change QuickFix
...
QuickFix for Repo location change.
2016-01-22 20:46:10 -08: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
