Kevin Ross
d3971b26e4
add a valid js stub
9 years ago
Kevin Ross
a44a201f00
rewrite js files to a valid stub
9 years ago
Adam Warner
3a46e7fc0a
Merge pull request #338 from pi-hole/auto-chronometer-lcd-setup
...
Auto chronometer lcd setup
9 years ago
jacobsalmela
c5d45edf2d
consoleblank=0
...
This makes sure the LCD screen does not go blank after a set period of
time.
9 years ago
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.
9 years ago
jacobsalmela
f0e5b2b6f9
Merge branch 'master' into auto-chronometer-lcd-setup
9 years ago
Hippyjake
21c688a8a8
add uptime -p to chrono script
9 years ago
jacobsalmela
3142992c57
update
9 years ago
Promofaux
4c24186911
Fixes divide by zero error.
9 years ago
Promofaux
70e4104c17
Merge remote-tracking branch 'origin/development'
9 years ago
Mcat12
48f9a61ff0
Updated License
9 years ago
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.
9 years ago
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.
9 years ago
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.
9 years ago
Promofaux
754beed3a1
Bring up to date with master
9 years ago
Promofaux
8ecf8eb76c
output to match other scripts
9 years ago
Promofaux
3cd1a5b1d5
... Helps if I add the changes to the repo file, and not the test file on my pi.
9 years ago
Promofaux
dfcf9d133e
Make output make a bit more sense
9 years ago
jacobsalmela
71fd32b1f4
script to set everything up
9 years ago
jacobsalmela
fcf3b4e4e2
file to set lcd font size
9 years ago
Dan Schaper
1e735c26c4
Repo Change QuickFix
...
QuickFix for Repo location change.
9 years ago
Dan Schaper
494fcd60ab
Merge branch 'development' of https://github.com/jacobsalmela/pi-hole into development
9 years ago
Mcat12
544919175c
Added back in debugging response header
9 years ago
Mcat12
ede8f4714f
Removed extra http redirect
9 years ago
Promofaux
af982a02af
Move call to CheckIPv6 function into CalcBlockedDomains, rather than relying on remembering to call it before you call CalcBlockedDomains.
9 years ago
Jacob Salmela
9ba38e668a
Merge pull request #193 from PromoFaux/Chronometer
...
Major overhaul of chronometer script
9 years ago
Adam Warner
f665899116
Update chronometer.sh
...
weirdness
9 years ago
Adam Warner
de464e17cc
Update chronometer.sh
...
Note to self, Find&Replace>Replace All is a bad idea.
9 years ago
Adam Warner
0eed56380d
Update chronometer.sh
...
What, me? Reference the wrong file?
9 years ago
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.
9 years ago
Jacob Salmela
d77399727c
Merge pull request #189 from jacobsalmela/whitelist
...
Switched CRLF to LF (DOS to UNIX)
9 years ago
Promofaux
414ef54cfe
Switched CRLF to LF (DOS to UNIX)
9 years ago
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.
9 years ago
jacobsalmela
bd5ed2bcf0
move webinterface.sh into scripts folder
...
I also renamed it to make it is easier to identify.
9 years ago
Promofaux
f9a2ca5c32
Tidy up help text on both scripts. Add quiet help.
9 years ago
Adam Warner
2b0bee085b
Incorrect reference to whitelist in the blacklist.sh comments :)
9 years ago
Adam Warner
5d842a7533
Merging
9 years ago
Adam Warner
f68cf10efa
Tidied up a couple of things
9 years ago
Adam Warner
89e3c25a90
Behaves like whitelist, but on the blacklist
9 years ago
Adam Warner
14ee4850af
Placeholder for blacklist script
9 years ago
Adam Warner
534dbc9b6e
added a quiet option for when the script is called by gravity. Less output = less confusion!
9 years ago
Adam Warner
8ad116fe7b
Aiming to get whitelist.sh to run either standalone or to be called from gravity.sh. Initial commit
9 years ago
jacobsalmela
ca5e34a9a9
Merge branch 'master' into whitelist
...
# Conflicts:
# gravity.sh
9 years ago
Jacob Salmela
4b1dd8a2a5
fixes #158
...
Running at midnight, not 11:58 in the afternoon.
9 years ago
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...
9 years ago
Dan Schaper
d215fa9ade
Resolve merge confict
9 years ago
Dan Schaper
cb91b8f5fa
Add copyright headers
9 years ago
Jacob Salmela
f453d407a9
log-async
...
For better performance. I have been using it for a few weeks with no
adverse effects.
9 years ago
Jacob Salmela
49a40115c8
fixes #105
9 years ago
Dan Schaper
2193d6a81f
Document dnsmasq.conf config
9 years ago