Dan Schaper
71e3a473d6
Fix = underbar
8 years ago
Dan Schaper
c2cfc09f63
Clean up more of the UX and log. Lots to go.
8 years ago
Dan Schaper
01f10b56e8
Refactor out some more reudndant code.
8 years ago
Dan Schaper
90ec0a610e
Tricorder is introduced.
8 years ago
Dan Schaper
42bff1ce1b
Move parse utility to be near other parsing functions.
8 years ago
Dan Schaper
e3c7a1f31f
Top half user output updated.
8 years ago
Dan Schaper
0debbffa70
Add a couple of parsing utility functions.
8 years ago
Jacob Salmela
473b58d26d
Merge pull request #704 from stonedbovines/development
...
lighttpd.conf templates change
8 years ago
Dan Schaper
300001e766
Remove `listen-address` directive
...
Since we declare an `interface` `dnsmasq` should ignore the `listen-address` directive thus making redundant. Removed.
8 years ago
Adam Warner
21fc6344bf
Merge pull request #849 from pi-hole/aManHasNoNameResolution
...
[BugFix] A man has no name resolution
8 years ago
Dan Schaper
f9570a82cc
Remove glitchy daemon detection.
8 years ago
Dan Schaper
36285ead57
Just becuase this is bugging me, but I'll fix it later.
8 years ago
Dan Schaper
13e488dace
Daemon check for lighttpd and dnsmasq.
8 years ago
Dan Schaper
f169da8fd0
Set for quiet temporarily.
8 years ago
Dan Schaper
60741298b7
Cut more verbosity. Prep for `lsof` parsing and daemon tests.
8 years ago
Dan Schaper
f73734acb0
Only check IPv6 Gateway if it exists.
8 years ago
Dan Schaper
fc360abe43
Only check IPv6 if system is enabled.
8 years ago
Adam Warner
3996e11425
Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist
...
Improvements to White and Blacklists
8 years ago
Dan Schaper
98db002770
Tighten IP test reponse to user.
8 years ago
Eric Warnke
f1c1caf7bd
url.rewrite does not work in $HTTP block lighttpd bug #2526
8 years ago
Eric Warnke
e2997b8135
Due to lighttpd bug 2526 the url.rewrite for javascript must be placed
...
outside of the $HTTP block or it will never evaluate.
8 years ago
Adam Warner
0d6a6b97f9
remove whitelist and blacklist scripts
8 years ago
Adam Warner
469ff45f01
create list.sh. Combines whitelist and blacklist scripts in an effort to reduce code duplication.
...
update pihole script to reflect new white/blacklist command.
8 years ago
Dan Schaper
4269626f5d
Attribute source for bashism.
8 years ago
Dan Schaper
8fa897aadb
Add back in sourcing files (setupVars.conf) and tweak `ip_check`
8 years ago
Dan Schaper
f549618d12
Move environment IPv6 interface check to `ip_check` and fix IPv6 source routing issue.
8 years ago
Dan Schaper
2fa47aaf31
Source routing is deprecated by RFC5095
8 years ago
Dan Schaper
b0874fb23a
Temporarily get rid of gateway sourcing from setupVars, temporarily.
8 years ago
Dan Schaper
fb70fd77e8
Prototype version_check, add helper functions for logging and echo.
8 years ago
Dan Schaper
01f17f9cbb
Reduce header verbosity. New header writer.
8 years ago
Adam Warner
18005ceee8
add hostname lines in 01-pihole.conf
8 years ago
Adam Warner
eb52f81a5c
add pi.hole entries to 01-pihole.conf
8 years ago
Adam Warner
aba0d93fda
Merge pull request #814 from pi-hole/promoTweaksTheSecond
...
Various tweaks and fixes: Part 2 (Plus Pause/Resume button functionality!)
8 years ago
Promofaux
b49384ffe4
intent
8 years ago
Promofaux
7fb622638b
flip reload logic. Do not reload if there are not changes made to blacklist.txt
8 years ago
Promofaux
bd0cc134bf
MERGE FAIL :ashamed_face:
8 years ago
Promofaux
476fd1f695
indentation
8 years ago
Promofaux
96053d13be
Flip reload logic. Do not reload lists if no changes made to whitelist.txt
8 years ago
Promofaux
c958bed418
Consistency changes. Replace MOST uses of `echo >> ${DebugLog}` with usage of `log_write` function
8 years ago
Promofaux
2b2c240d39
Fix shebang line broken in #831
...
Remove root check and references to ${SUDO}
Check for /etc/pihole/setupVars.conf and use piholeInterace in IPv6 checks as suggest by @jacobsalmela https://github.com/pi-hole/pi-hole/pull/831#issuecomment-255606854
8 years ago
Promofaux
b79392ba2c
exit after displaying white/blacklist
8 years ago
Promofaux
d0826b2c33
Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
8 years ago
Marcus Hildum
5d6072524c
Consistency
...
Missed one
8 years ago
Marcus Hildum
07a66a70fc
Consistency
...
More of the same
8 years ago
Marcus Hildum
69ba8a3c2f
Consistency
...
Again trying to move the repo to one style. Doesn't matter if it's
changed afterwards, but one style instead of about five seems
saner.
8 years ago
Marcus Hildum
a30c75ef71
Consistency
...
Cleanup!
8 years ago
Marcus Hildum
d0b3727c5d
Consistency
...
Yet more cleanup
8 years ago
Marcus Hildum
6e94bf5b6d
Consistency
...
You know the drill
8 years ago
Marcus Hildum
0f04e270a7
consistency
...
Just more cleanup
8 years ago
Adam Warner
44a36368a2
Merge pull request #822 from pi-hole/ChangeWarning
...
Add file change warning to header
8 years ago
Promofaux
c0012540ed
Re-add shebang
8 years ago
Promofaux
9ab6df0e54
Merge branch 'development' into promoTweaksTheSecond
...
# Conflicts:
# advanced/Scripts/blacklist.sh
# advanced/Scripts/whitelist.sh
8 years ago
Adam Warner
3623183072
Remove reference to non-existent script
8 years ago
Dan Schaper
e6bd979aeb
Can't spell
...
Fix spelling error
8 years ago
Dan Schaper
b5b6350cc7
Add file change warning to header
8 years ago
Marcus Hildum
0efda04920
Use heredocs instead of multiple calls to echo
...
There were a lot of places (like in help functions) that used multiple
echo calls instead of heredocs. Personal opinion but this seems cleaner.
8 years ago
Marcus Hildum
28eeaf201b
Standardize function declaration
...
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical
myfucn() {
}
style.
8 years ago
Promofaux
a64f4cd871
whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument
8 years ago
Promofaux
a41eff1276
Blacklist script now only directly edits blacklist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument
8 years ago
Adam Warner
b66f23cfd0
account for new update script
8 years ago
Adam Warner
27d6e5d8cf
Complete overhaul of update logic. Moved to seperate script
8 years ago
Adam Warner
ce46c4dec4
remove prematurely added code
8 years ago
Adam Warner
013d77488a
complete overhaul of version script. Now with optional arguments!
8 years ago
Adam Warner
29ad2496b6
don't output "elevating with sudo" in pihole script, just do it.
8 years ago
Adam Warner
97a013b2b7
Add direction to change upstream servers in setupVars.conf
8 years ago
Adam Warner
77808223dc
remove stock comments from 01-pihole.conf and add warning to the top
8 years ago
Promofaux
8c0f860601
Use systemctl/service calls instead of killall to restart/reload dnsmasq
8 years ago
Promofaux
7e10dcdcf0
update pihole bash-completion
8 years ago
Promofaux
090fbd04af
Remove ${SUDO} usages and root checks from scripts called by `pihole` command as they should not be called directly.
8 years ago
Jakob Ackermann
28ef8068c8
add mimetype for .svg
...
Chrome does not display .svg-images without the correct mimetype
8 years ago
Dan Schaper
9a421d510a
Ignore comments in adlists.list section.
8 years ago
Dan Schaper
a9c3e2c7ba
Add log_write function. Update version_check to use logical conditionals.
8 years ago
Dan Schaper
7fcb40739d
Close IF statement
8 years ago
Dan Schaper
5a3d319677
Add fail check to dig local and remote.
8 years ago
Dan Schaper
8466d0b681
Change NSLOOKUP to dig for resolver tests, add dnsmasq specific records check
8 years ago
Dan Schaper
5de179f1eb
Remove blacklist comparison.
8 years ago
Dan Schaper
36e10595cc
Change netstat to lsof.
8 years ago
Dan Schaper
edd7f28104
Add internet checks to IP section
8 years ago
Dan Schaper
dba1ab3fc0
Remove compareWhitelist
8 years ago
Dan Schaper
3df9c48012
Include ping statistics in default gateway checks.
8 years ago
Dan Schaper
ac1c299369
Revert overzealous renaming of Pi-hole in pihole.log detection.
8 years ago
Dan Schaper
5bbb3ac49a
Standardize Pi-hole naming.
8 years ago
Dan Schaper
014bdf911a
Add open port detection
8 years ago
Dan Schaper
874853fe18
Add lighttpd to version check
8 years ago
Dan Schaper
274b71f8bc
Relocate hostname checks
8 years ago
Dan Schaper
c41d543d81
Handle lack of IPv6 gracefully.
8 years ago
Dan Schaper
7729ddab30
Mode code realignment. Handle lack of IPv6 gateway gracefully.
8 years ago
Dan Schaper
60c0e59a83
Add IPv6 intelligence to debug
8 years ago
Steve Dobinson
737b510116
Update lighttpd.conf.fedora
...
Allow for password protection (or other user-initiated options) without clobbering already chosen user options.
8 years ago
Steve Dobinson
47cba83450
Update lighttpd.conf.debian
...
Allow for password protection (or other user-initiated options) without clobbering already chosen user options.
8 years ago
Adam Warner
dcedf6bfd0
Merge branch 'development' into PromoFaux-patch-1
8 years ago
Promofaux
3d5140458b
Change cron job
8 years ago
Adam Warner
b1a7b0a186
Update piholeDebug.sh
...
I can spell, honest.
8 years ago
Promofaux
a3ef9efd2f
remove updateDashboard script
8 years ago
Promofaux
95ee3216c4
Add the newer pihole command tags to the bash auto complete!
8 years ago
Adam Warner
eb201b614a
Change log flush time to 00:00
8 years ago
Adam Warner
8cb2f85a08
Replace `truncate` command with `echo " " >`
8 years ago
Promofaux
01a9534729
Merge branch 'development' into UpdateMethod
...
# Conflicts:
# automated install/basic-install.sh
8 years ago
Promofaux
b3e7619048
curly brackets all the variables!
8 years ago
Victor Marquez
0121136498
Added window.close() to index.html
...
Adding window.close() will automatically close any pop-ups that might get loaded with a blocked ad.
8 years ago
Adam Warner
95edb49bb8
Add option for uploading debug log to termbin
8 years ago
Promofaux
e11ef5a7f0
Add version display script. Also checks current version on web and reports version.
8 years ago
diginc
5fb6c5b012
Making the whitelist re-block echo consistent with other WL/BL echos
8 years ago
diginc
3affa73257
Only re-block whitelist deletions if in adlists
...
* Prevent blocking benign/untracked domains deleted off whitelist
* Issue #581
8 years ago
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.
8 years ago
Promofaux
61ff12e8d4
Change header to match the rest of the scripts.
8 years ago
Promofaux
e942440bb7
Dan forgot this : `}`
8 years ago
Promofaux
6f068e0b9c
Replace sprunge.us with termbin, which appears to be more reliable.
8 years ago
Sander
11f2524b9b
Instead of an or, cat *release
8 years ago
Dan Schaper
b011e5f838
Add os-release check
8 years ago
Dan Schaper
f45eb84d6b
Add distribution Check
8 years ago
Daniel
9b8efe1b27
Upload log to sprunge.us
8 years ago
bcambl
27a9642090
check for sudo via 'command -v' instead of dkpg-query
8 years ago
bcambl
376eb81181
SELinux Support
8 years ago
bcambl
66724826f5
moved php-fastcgi.socket to /tmp on Fedora
...
fastcgi is spawned by lighttpd (lighttpd user).
/var/run is owned by root, so we will put the socket in /tmp
8 years ago
bcambl
62fa9c0f6e
fixing whitespace
8 years ago
bcambl
6f2117d786
append '.debian' to lighttpd.conf for compatability
8 years ago
bcambl
d67957d015
add fedora lighttpd.conf template
8 years ago
Mcat12
a16cd9aef7
Merge pull request #469 from pi-hole/web-sudo
...
Give WebUI permissions to run pihole commands
8 years ago
Mcat12
3fda2d9ac3
Fix helpfunc not found error
8 years ago
Carter Maxwell
c0e1772e21
Replace toilet with echo
9 years ago
Mcat12
f03303e5aa
Add X-Pi-hole header
9 years ago
Mcat12
7bc2844b9d
Remove X-Pi-hole header
...
Also adds `X-Frame-Options: DENY` for the admin directory, so that
an ad can't load it into a frame
9 years ago
Jim Liu
08e6f60941
Update blacklist.sh
9 years ago
Jim Liu
10066209e7
Update whitelist.sh
...
Change piholeIPfile to a permanent location.
9 years ago
Jim Liu
81fdfcba22
Update whitelist.sh
9 years ago
Mcat12
619082dbed
Merge branch 'development' into BugFix463
...
Conflicts:
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
9 years ago
Mcat12
d7abbbfac4
Change mode of sudoer file
9 years ago
Mcat12
c714196647
Add Sudoer file for WebUI
9 years ago
Mayur Raiturkar
56ac04c48e
fixed helpFunc 2
9 years ago
Mayur Raiturkar
b58519b974
fixed helpFunc 1
9 years ago
Promofaux
ad574f5e90
Replace kill with killall
9 years ago
Promofaux
4941a657bf
remove -s switch, as it turns out it worked afterall.
9 years ago
Promofaux
3d4bff9414
Add -s switch to kill command to increase compatability
9 years ago
Adam Warner
77f4126f9b
add root check to whitelist script
9 years ago
Adam Warner
4c890ab202
Add root check to blacklist script
9 years ago
Adam Warner
d10e9b1b6e
add pihole/webui version numbers
9 years ago
Adam Warner
a6bee76581
add location of debug log output file!
9 years ago
nate
2f4f5a6ad2
Added lighttpd error.log to debug output
9 years ago
Promofaux
48fa83c9ac
Fix whitespace
9 years ago
Promofaux
05e0003555
Fixes issue #453
9 years ago
Promofaux
107e0404de
Move `exit 1` outside of `if` block on verbose check to stop dnsmasq reloading
9 years ago
Promofaux
ab99e80333
indent
9 years ago
Promofaux
3154a378a6
Remove clear in DisplayWlist and force verbose to false to tidy up output.
9 years ago
Promofaux
8e04f1c03e
Remove clear in DisplayBlist and forse verbose to false to tidy up output.
9 years ago
Promofaux
c0aadeab3d
fix spelling in name of variable ($versbose -> $verbose)
9 years ago
Promofaux
6c87698f1a
fix spelling in name of variable ($versbose -> $verbose)
9 years ago
Justin Theberge
9a4c5cef86
fix indentations
9 years ago
Justin Theberge
bdfc86f850
fix formatting
9 years ago
Justin Theberge
70dadfba28
add list options requested from issue#442
9 years ago
Adam Warner
391dea445a
Move help output to function, add -h argument
9 years ago
Adam Warner
e074c72130
Move help output to function helpFunc, add -h argument.
9 years ago
Promofaux
9c94af04cc
Fixes #432 . Thanks to @VDRrulez and @jradwan for pointing it out...
9 years ago
Promofaux
849185d3c9
Fix incorrect echo
9 years ago
Promofaux
47cc757ed0
Fix incorrect echo
9 years ago
Promofaux
0bbfb323b1
make whitelist honour pihole.conf file
9 years ago
Promofaux
4f08359786
Make blacklist honour pihole.conf file
9 years ago
nate
7e06769d44
Double quoting
9 years ago
nate
5347ee4896
Write verbose status of processes to debug log & Minor UI Fixes
9 years ago
Promofaux
97d3aedba1
Add some output to the log flush
9 years ago
nate
7f9410fd34
Added uninstall option to bash-completion
9 years ago
nate
1a2046a7eb
Added uninstall option to `pihole` command. Minor fixes
9 years ago
nate
6eea9239a7
Merged branch development into PiHoleController
9 years ago
Mcat12
e97755eb91
Fix missing cats
9 years ago
nate
d47fbbbe96
Mcat12 requests. Added bash-completion support
9 years ago
nate
b80821c4b7
Merged branch development into PiHoleController
9 years ago
nate
cf01b5a002
Readded `cat` calls to fix permission issue
9 years ago
nate
bb66d559e7
Merge branch 'development'
...
Conflicts:
gravity.sh
9 years ago
nate
7b8fa3b922
Permissions changed for /etc/pihole and cleaned up some output
9 years ago
nate
28f2a1309e
Merge branch 'development'
...
Conflicts:
automated install/uninstall.sh
9 years ago
nate
2625d9f7fe
Made piholeDebug.sh +x
9 years ago
nate
5f7c11f495
Sudo added to ifconfig to ensure it runs if debug not run as root
9 years ago
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
9 years ago
nate
f8427ab789
Merge remote-tracking branch 'refs/remotes/pi-hole/development'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
9 years ago
nate
fee55fa642
Added gravity.sh to the list of options
9 years ago
nate
76ea1962be
Controller script, pihole.sh added
...
Syntax changes for user output to be consistent
9 years ago
nate
f2150ee7e1
Merge conflict resolution
9 years ago
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
9 years ago
nate
a4fbccac9b
Merge conflict resolution
9 years ago
nate
a0cf93a7ca
Merge branch 'PiholeDebug'
...
Conflicts:
README.md
9 years ago
nate
8ef4c12f97
Merge branch 'ScriptCleanup'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
9 years ago
nate
6145748bfb
Change single echo to printf to forrect \t interpretation
9 years ago
nate
1a1026b367
Consistent stdout to match basic-install.sh and uninstall.sh
9 years ago
nate
5ee382c8eb
Roll back addition of piholeDebug.sh (production master base)
9 years ago
nate
0b9e78df2c
Cleaned code and added prompt for purge on uninstall
9 years ago
nate
a9c24b456d
Bug fixes and logging improvements
...
Finalized for production deployment. Next release targeting a tarball of config files plus additional logging.
9 years ago
nate
b4463bf42c
Added test for nslookup
...
Checks the TESTURL for nslookup is not whitelisted
9 years ago
nate
8f8dc66c70
Ignore whitespace when writing config files
9 years ago
Nate
b746250e71
Made all advanced/Scripts/ executable for consistency.
9 years ago
Promofaux
bc09760c84
Grab changes by @rosskevin. ( #386 - lighttpd changes to handle JS files)
9 years ago
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
9 years ago
nate
04638c9065
Added 01-pihole.conf from /etc/dnsmasq.d/ to log
...
Write 01-pihole.conf to debug log
9 years ago
nate
b0dd231018
Modified description in header
...
Removed copied header description from piholeLogFlush.sh and replaced with relevant description.
9 years ago
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.
9 years ago
Kevin Ross
b79db36336
no need for the X- header prefix in the string
9 years ago
Kevin Ross
d3971b26e4
add a valid js stub
9 years ago
Kevin Ross
a44a201f00
rewrite js files to a valid stub
9 years ago
Morlok8k
d13ae0610e
fix for older versions of uptime, on development branch.
9 years ago
Carter Maxwell
ced0ae0d65
remove trailing whitespace whitelist.sh
9 years ago
Carter Maxwell
876c51302a
remove trailing whitespace updateDashboard.sh
9 years ago
Carter Maxwell
a6877e7c13
remove trailing whitespace chronometer.sh
9 years ago
Carter Maxwell
f633d1fa5b
remove trailing whitespace blacklist.sh
9 years ago
Carter Maxwell
4f90b41343
remove trailing whitespace dnsmasq.conf.original
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
Jacob Salmela
c34cc1608b
for use with logstalgia
...
This seems to show the domain queried and the path requested.
9 years ago
Jacob Salmela
1eb7f879f0
fixes #101
...
the line url.access-deny caused the error.
9 years ago
Jacob Salmela
831322b8b2
replace file paths with variables
9 years ago
Jacob Salmela
573c1ef94f
double bracket notation
9 years ago
Jacob Salmela
a2cddda590
if whitelist.txt doesn't exist, create it
9 years ago
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.
9 years ago
Jacob Salmela
a675dc3f2c
Merge pull request #68 from dschaper/hawson-reduce-memory
...
Hawson reduce memory
9 years ago
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.
9 years ago
Jacob Salmela
271163ed66
Merge pull request #61 from nathanpjones/improve-whitelist-script
...
Improve whitelisting script
9 years ago
Jacob Salmela
2f9e650739
Merge pull request #62 from jacobsalmela/lighttpd
...
New lighttpd.conf. Closes #31 and #50
9 years ago
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.
9 years ago
Jacob Salmela
17904b3106
ads still get blocked when a 404 happens
9 years ago
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
9 years ago
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
9 years ago
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.
9 years ago
jacobsalmela
d68c262b96
swap file to eliminate memory allocation error
9 years ago
Fourdee
52ef76d717
missed a few more /etc/host changes
9 years ago
Dan
024395b73b
Update chronometer.sh
...
Missed a change todaysAdsEliminated to /\/etc\/pihole\/gravity.list/
9 years ago
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.
9 years ago
Jacob Salmela
2d96f005e6
Merge pull request #28 from Fourdee/patch-2
...
Adjusting chronomiter.sh to use the new /var/log/pihole.log
9 years ago
Dan
9627b27f15
pihole logfile changes
...
https://github.com/jacobsalmela/pi-hole/pull/27
9 years ago
Dan
9230be63d5
.log extension
9 years ago
Dan
e20f948e49
Log PiHole dns stats to /var/log/pihole
...
Log PiHole dns stats to /var/log/pihole
Removes the requirement for rsyslog and reading the shared logfile /var/log/daemon.log
9 years ago
jacobsalmela
11614263b8
better version of LCD display stats
9 years ago
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...
9 years ago
rmceoin
b7e2c8053b
Add local-ttl to dnsmasq config so that queries are cached by the requesting device.
9 years ago
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!
9 years ago
jacobsalmela
e8b33ec8ee
Automated installer test
9 years ago
jacobsalmela
294cf6d595
Removing since not using IPv6 right now
9 years ago
jacobsalmela
9d5a7531ca
Testing script for a mini LCD
...
This script is for use with an Adafruit LCD so that you can peek at the
domains as they are blocked in real time. It's not necessary for the
Pi-hole to function, but something fun I am working on. There will be
a video in the next article I post.
9 years ago
jacobsalmela
e6b17ae8e9
Removing IPv6 support for now
...
I'm not fully up on my IPv6, and using the loopback doesn't work for
clients anyway as described in the latest commit to gravity.sh
9 years ago
jacobsalmela
7290f7f950
Multiple gif files to choose from
...
25Bytes is the smallest, but can sometimes display weird on different
browser/systems. Pick the one that works the best for you.
9 years ago
jacobsalmela
68ff6b02f9
listening on IPv6, too
...
Removed server=127.0.0.1 because it listens there by default
9 years ago
jacobsalmela
857c1e6edf
new index to display tiny gif
...
The GIF is only 25 Bytes.
Thanks to http://probablyprogramming.com/2009/03/15/the-tiniest-gif-ever
9 years ago
jacobsalmela
1637e9fe58
Enabling IPv6 on the Pi itself
9 years ago
jacobsalmela
1ef3ab5af8
very similar lighttpd conf
9 years ago
jacobsalmela
7ed49b07cf
Enabling IPv6
9 years ago
jacobsalmela
56c776af22
hosts format script
10 years ago
jacobsalmela
ebeb25d4ae
initial commit
10 years ago
jacobsalmela
925e8630ca
initial commit
10 years ago
jacobsalmela
60cc27a978
file for automated install
10 years ago
jacobsalmela
72209cbac0
file for automated install
10 years ago