Dan Schaper
dcf6e6b14d
Clarify user action required to end the scripts.
8 years ago
Dan Schaper
908697a963
User token instructions, and small bugfix for missing separator.
8 years ago
Dan Schaper
fad2d6b1d1
Return values start showin up now. Logic operators too...
8 years ago
Dan Schaper
9cd830b6aa
Start to refine tests and clean up code.
8 years ago
Dan Schaper
d9a16b0ff4
Clear up bottom half of script with fewer redundenicies.
8 years ago
Dan Schaper
cb5c94ef5e
Sorry, left that gravity.list parser in. Big debug files. Cleared that up.
8 years ago
Dan Schaper
85fbd66871
Good commit point, number of changes
8 years ago
Eric Warnke
3da75d6125
Grep was leaking a file not found if blacklist didn't exist
8 years ago
Dan Schaper
d4a3a5c180
Trying to implement The Brontide Idiom for design.
8 years ago
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