Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
1770 commits 8 branches 109 tags 27 MiB
Commit graph

437 commits

Author SHA1 Message Date
Dan Schaper
f2d7a3d26d Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks 2016-11-02 09:48:00 -07:00
Adam Warner
ee37c37cab fix update output logic. version number variables should not be read only! 2016-11-02 14:29:20 +00:00
Dan Schaper
b636c1e1f8 Whitespace. 2016-11-02 07:00:43 -07:00
Dan Schaper
8b9f0487c0 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks 
# Conflicts:
#	advanced/Scripts/update.sh
#	automated install/basic-install.sh
 2016-11-02 06:57:33 -07:00
Dan Schaper
ece1667fb0 Refactor and move some bits. 2016-11-02 06:41:51 -07:00
Adam Warner
50bd8b4a09 Further tweaks to local repo handling 2016-11-02 13:34:57 +00:00
Dan Schaper
93d91353a1 All tabs now spaced 2016-11-02 05:49:33 -07:00
Dan Schaper
8dc9143b34 Just delete, no need to cd there first. 2016-11-02 05:45:29 -07:00
Dan Schaper
a0d9a1133c Factoring and combining functions 2016-11-02 05:34:39 -07:00
Dan Schaper
035e4bf727 Move value checks to if calls. 2016-11-02 03:55:04 -07:00
Dan Schaper
9ec5bbd560 Actually get is_repo to return a value and have it expected. 2016-11-02 03:38:35 -07:00
Dan Schaper
34482c5ed6 Modified is_repo 2016-11-02 03:09:59 -07:00
Dan Schaper
7d414b5628 Move version messages to main function, check for repos. 2016-11-02 01:12:02 -07:00
Dan Schaper
d9528dfd09 Bash is funny with returns. 2016-11-02 00:51:38 -07:00
Dan Schaper
9c83825cb8 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks 2016-11-01 22:20:32 -07:00
Dan Schaper
7a22471787 New naming convention, and reorder functions as bash would prefer them to be. 2016-11-01 22:19:40 -07:00
diginc
c30478bf4a cleanup and use sentintel in is_repo 2016-11-01 23:21:50 -05:00
diginc
d986746ef9 missing quote added 2016-11-01 23:07:20 -05:00
diginc
a8fa061f2e quote all the assignments prevent accidental glob splitting 2016-11-01 23:02:06 -05:00
Jacob Salmela
f8e9726922 source setupVars and check for the correct variable 2016-11-01 19:01:48 -05:00
Jacob Salmela
884363bd05 remove ipv6 check since it's already in setupVars 2016-11-01 19:01:28 -05:00
Dan Schaper
bdd240ecb6 Shellcheck catch for always true expansion. 2016-11-01 15:36:27 -07:00
Dan Schaper
04da292df9 Missed one spinner, updated and exit script if github is unreachable. 2016-11-01 12:17:38 -07:00
Dan Schaper
85b8676b8e Remove spinner, no functions here should last that long, and it masks a few potential exit avenues. 2016-11-01 12:16:46 -07:00
Dan Schaper
114bc13c23 Specify path, cron may not know where the files are located. 2016-11-01 12:03:26 -07:00
Dan Schaper
5fef5f1ed4 Break down is_repo to make sure it does what is expected. 2016-11-01 11:54:14 -07:00
Dan Schaper
807b60b0e6 Missed the second reinstaller.... 2016-11-01 11:44:16 -07:00
Dan Schaper
fbc800e556 If unattened reinstall fails, notify user and exit script immediately. 2016-11-01 11:42:18 -07:00
Dan Schaper
1991ee7a7d Google Style Guide. readonly and cap constants. 2016-11-01 11:36:44 -07:00
Dan Schaper
ffbfadbccf Detail what the script does. 2016-11-01 11:33:04 -07:00
Dan Schaper
c3e2bce956 Variables declared as strings, make sure they are strings when we use them in functions. 2016-11-01 11:26:57 -07:00
Dan Schaper
0c9520d7e3 Protect against unexepcted return values (GitHub not responding as we'd expect.) And make sure bash doesn't maul the variables and cause firing of unattended reinstall of application when values returned aren't as expected. 2016-11-01 11:18:41 -07:00
Dan Schaper
1e7e5230cc Clarify what exactly is being called and the expected returned value format 2016-11-01 11:15:21 -07:00
Dan Schaper
f1efc97357 Clairfy condition to make sure they operate as per the specs of the logic flow layout. 2016-11-01 11:04:33 -07:00
Adam Warner
d6fe48112c Merge pull request #857 from pi-hole/feature/debugUpdate 
Debug Updates
 2016-10-29 23:15:07 +01:00
Dan Schaper
dcf6e6b14d Clarify user action required to end the scripts. 2016-10-29 12:24:22 -07:00
Dan Schaper
908697a963 User token instructions, and small bugfix for missing separator. 2016-10-29 12:04:18 -07:00
Dan Schaper
fad2d6b1d1 Return values start showin up now. Logic operators too... 2016-10-28 15:53:18 -07:00
Dan Schaper
9cd830b6aa Start to refine tests and clean up code. 2016-10-28 15:37:45 -07:00
Dan Schaper
d9a16b0ff4 Clear up bottom half of script with fewer redundenicies. 2016-10-28 15:25:06 -07:00
Dan Schaper
cb5c94ef5e Sorry, left that gravity.list parser in. Big debug files. Cleared that up. 2016-10-28 15:13:04 -07:00
Dan Schaper
85fbd66871 Good commit point, number of changes 2016-10-28 14:52:08 -07:00
Eric Warnke
3da75d6125 Grep was leaking a file not found if blacklist didn't exist 2016-10-28 17:28:04 -04:00
Dan Schaper
d4a3a5c180 Trying to implement The Brontide Idiom for design. 2016-10-28 10:42:30 -07:00
Dan Schaper
71e3a473d6 Fix = underbar 2016-10-28 07:16:16 -07:00
Dan Schaper
c2cfc09f63 Clean up more of the UX and log. Lots to go. 2016-10-28 07:06:05 -07:00
Dan Schaper
01f10b56e8 Refactor out some more reudndant code. 2016-10-28 06:51:30 -07:00
Dan Schaper
90ec0a610e Tricorder is introduced. 2016-10-28 04:42:45 -07:00
Dan Schaper
42bff1ce1b Move parse utility to be near other parsing functions. 2016-10-28 03:53:53 -07:00
Dan Schaper
e3c7a1f31f Top half user output updated. 2016-10-28 03:49:03 -07:00
Dan Schaper
0debbffa70 Add a couple of parsing utility functions. 2016-10-28 03:45:07 -07:00
Jacob Salmela
473b58d26d Merge pull request #704 from stonedbovines/development 
lighttpd.conf templates change
 2016-10-27 20:22:46 -05:00
Dan Schaper
300001e766 Remove listen-address directive 
Since we declare an `interface` `dnsmasq` should ignore the `listen-address` directive thus making redundant. Removed.
 2016-10-27 11:56:16 -07:00
Adam Warner
21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution 
[BugFix] A man has no name resolution
 2016-10-27 19:41:07 +01:00
Dan Schaper
f9570a82cc Remove glitchy daemon detection. 2016-10-27 00:58:24 -07:00
Dan Schaper
36285ead57 Just becuase this is bugging me, but I'll fix it later. 2016-10-27 00:32:18 -07:00
Dan Schaper
13e488dace Daemon check for lighttpd and dnsmasq. 2016-10-27 00:30:51 -07:00
Dan Schaper
f169da8fd0 Set for quiet temporarily. 2016-10-26 14:48:11 -07:00
Dan Schaper
60741298b7 Cut more verbosity. Prep for lsof parsing and daemon tests. 2016-10-26 14:33:47 -07:00
Dan Schaper
f73734acb0 Only check IPv6 Gateway if it exists. 2016-10-26 13:57:57 -07:00
Dan Schaper
fc360abe43 Only check IPv6 if system is enabled. 2016-10-26 12:22:20 -07:00
Adam Warner
3996e11425 Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist 
Improvements to White and Blacklists
 2016-10-26 19:52:16 +01:00
Dan Schaper
98db002770 Tighten IP test reponse to user. 2016-10-26 11:38:19 -07:00
Eric Warnke
f1c1caf7bd url.rewrite does not work in $HTTP block lighttpd bug #2526 2016-10-26 11:49:42 -04:00
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.
 2016-10-26 11:49:31 -04:00
Adam Warner
0d6a6b97f9 remove whitelist and blacklist scripts 2016-10-26 09:56:45 +01:00
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.
 2016-10-26 09:36:02 +01:00
Dan Schaper
4269626f5d Attribute source for bashism. 2016-10-25 21:53:41 -07:00
Dan Schaper
8fa897aadb Add back in sourcing files (setupVars.conf) and tweak ip_check 2016-10-25 21:39:28 -07:00
Dan Schaper
f549618d12 Move environment IPv6 interface check to ip_check and fix IPv6 source routing issue. 2016-10-25 21:25:57 -07:00
Dan Schaper
2fa47aaf31 Source routing is deprecated by RFC5095 2016-10-25 20:53:18 -07:00
Dan Schaper
b0874fb23a Temporarily get rid of gateway sourcing from setupVars, temporarily. 2016-10-25 19:53:00 -07:00
Dan Schaper
fb70fd77e8 Prototype version_check, add helper functions for logging and echo. 2016-10-25 17:50:14 -07:00
Dan Schaper
01f17f9cbb Reduce header verbosity. New header writer. 2016-10-25 17:19:33 -07:00
Adam Warner
18005ceee8 add hostname lines in 01-pihole.conf 2016-10-25 15:03:49 +01:00
Adam Warner
eb52f81a5c add pi.hole entries to 01-pihole.conf 2016-10-25 14:54:10 +01:00
Adam Warner
aba0d93fda Merge pull request #814 from pi-hole/promoTweaksTheSecond 
Various tweaks and fixes: Part 2 (Plus Pause/Resume button functionality!)
 2016-10-25 17:43:40 +06:00
Promofaux
b49384ffe4 intent 2016-10-23 22:44:21 +01:00
Promofaux
7fb622638b flip reload logic. Do not reload if there are not changes made to blacklist.txt 2016-10-23 22:44:06 +01:00
Promofaux
bd0cc134bf MERGE FAIL :ashamed_face: 2016-10-23 22:43:11 +01:00
Promofaux
476fd1f695 indentation 2016-10-23 22:38:18 +01:00
Promofaux
96053d13be Flip reload logic. Do not reload lists if no changes made to whitelist.txt 2016-10-23 22:38:06 +01:00
Promofaux
c958bed418 Consistency changes. Replace MOST uses of echo >> ${DebugLog} with usage of log_write function 2016-10-23 22:31:20 +01:00
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
 2016-10-23 22:15:10 +01:00
Promofaux
b79392ba2c exit after displaying white/blacklist 2016-10-23 19:49:51 +01:00
Promofaux
d0826b2c33 Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev 2016-10-23 19:33:28 +01:00
Marcus Hildum
5d6072524c Consistency 
Missed one
 2016-10-22 10:26:00 -07:00
Marcus Hildum
07a66a70fc Consistency 
More of the same
 2016-10-22 10:12:05 -07:00
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.
 2016-10-22 10:01:15 -07:00
Marcus Hildum
a30c75ef71 Consistency 
Cleanup!
 2016-10-22 00:35:44 -07:00
Marcus Hildum
d0b3727c5d Consistency 
Yet more cleanup
 2016-10-22 00:32:36 -07:00
Marcus Hildum
6e94bf5b6d Consistency 
You know the drill
 2016-10-22 00:14:38 -07:00
Marcus Hildum
0f04e270a7 consistency 
Just more cleanup
 2016-10-22 00:10:25 -07:00
Adam Warner
44a36368a2 Merge pull request #822 from pi-hole/ChangeWarning 
Add file change warning to header
 2016-10-21 11:24:12 +01:00
Promofaux
c0012540ed Re-add shebang 2016-10-20 21:08:07 +01:00
Promofaux
9ab6df0e54 Merge branch 'development' into promoTweaksTheSecond 
# Conflicts:
#	advanced/Scripts/blacklist.sh
#	advanced/Scripts/whitelist.sh
 2016-10-20 21:06:28 +01:00
Adam Warner
3623183072 Remove reference to non-existent script 2016-10-20 13:29:12 +01:00
Dan Schaper
e6bd979aeb Can't spell 
Fix spelling error
 2016-10-20 04:27:12 -07:00
Dan Schaper
b5b6350cc7 Add file change warning to header 2016-10-20 03:42:25 -07:00
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.
 2016-10-19 20:46:37 -07:00
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.
 2016-10-19 19:47:45 -07:00
Promofaux
a64f4cd871 whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument 2016-10-19 23:17:20 +01:00
Promofaux
a41eff1276 Blacklist script now only directly edits blacklist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument 2016-10-19 23:16:52 +01:00
Adam Warner
b66f23cfd0 account for new update script 2016-10-18 14:19:44 +01:00
Adam Warner
27d6e5d8cf Complete overhaul of update logic. Moved to seperate script 2016-10-18 14:19:25 +01:00
Adam Warner
ce46c4dec4 remove prematurely added code 2016-10-18 12:11:02 +01:00
Adam Warner
013d77488a complete overhaul of version script. Now with optional arguments! 2016-10-18 12:07:11 +01:00
Adam Warner
29ad2496b6 don't output "elevating with sudo" in pihole script, just do it. 2016-10-18 12:05:48 +01:00
Adam Warner
97a013b2b7 Add direction to change upstream servers in setupVars.conf 2016-10-18 10:35:22 +01:00
Adam Warner
77808223dc remove stock comments from 01-pihole.conf and add warning to the top 2016-10-18 10:05:10 +01:00
Promofaux
8c0f860601 Use systemctl/service calls instead of killall to restart/reload dnsmasq 2016-10-16 17:16:59 +01:00
Promofaux
7e10dcdcf0 update pihole bash-completion 2016-10-15 20:12:16 +01:00
Promofaux
090fbd04af Remove ${SUDO} usages and root checks from scripts called by pihole command as they should not be called directly. 2016-10-15 17:54:04 +01:00
Jakob Ackermann
28ef8068c8 add mimetype for .svg 
Chrome does not display .svg-images without the correct mimetype
 2016-10-05 01:20:30 +02:00
Dan Schaper
9a421d510a Ignore comments in adlists.list section. 2016-10-01 13:16:58 -07:00
Dan Schaper
a9c3e2c7ba Add log_write function. Update version_check to use logical conditionals. 2016-09-28 13:09:38 -07:00
Dan Schaper
7fcb40739d Close IF statement 2016-09-28 10:25:37 -07:00
Dan Schaper
5a3d319677 Add fail check to dig local and remote. 2016-09-28 10:24:44 -07:00
Dan Schaper
8466d0b681 Change NSLOOKUP to dig for resolver tests, add dnsmasq specific records check 2016-09-28 10:14:47 -07:00
Dan Schaper
5de179f1eb Remove blacklist comparison. 2016-09-28 09:52:11 -07:00
Dan Schaper
36e10595cc Change netstat to lsof. 2016-09-28 09:51:14 -07:00
Dan Schaper
edd7f28104 Add internet checks to IP section 2016-09-27 19:39:28 -07:00
Dan Schaper
dba1ab3fc0 Remove compareWhitelist 2016-09-27 19:31:21 -07:00
Dan Schaper
3df9c48012 Include ping statistics in default gateway checks. 2016-09-27 19:30:37 -07:00
Dan Schaper
ac1c299369 Revert overzealous renaming of Pi-hole in pihole.log detection. 2016-09-26 20:54:05 -07:00
Dan Schaper
5bbb3ac49a Standardize Pi-hole naming. 2016-09-26 20:50:03 -07:00
Dan Schaper
014bdf911a Add open port detection 2016-09-26 20:39:39 -07:00
Dan Schaper
874853fe18 Add lighttpd to version check 2016-09-26 19:23:30 -07:00
Dan Schaper
274b71f8bc Relocate hostname checks 2016-09-26 18:52:12 -07:00
Dan Schaper
c41d543d81 Handle lack of IPv6 gracefully. 2016-09-26 18:27:02 -07:00
Dan Schaper
7729ddab30 Mode code realignment. Handle lack of IPv6 gateway gracefully. 2016-09-26 18:21:58 -07:00
Dan Schaper
60c0e59a83 Add IPv6 intelligence to debug 2016-09-26 18:06:31 -07:00
Steve Dobinson
737b510116 Update lighttpd.conf.fedora 
Allow for password protection (or other user-initiated options) without clobbering already chosen user options.
 2016-09-20 10:38:58 +01:00
Steve Dobinson
47cba83450 Update lighttpd.conf.debian 
Allow for password protection (or other user-initiated options) without clobbering already chosen user options.
 2016-09-20 10:34:21 +01:00
Adam Warner
dcedf6bfd0 Merge branch 'development' into PromoFaux-patch-1 2016-09-19 20:54:04 +01:00
Promofaux
3d5140458b Change cron job 2016-09-19 20:43:04 +01:00
Adam Warner
b1a7b0a186 Update piholeDebug.sh 
I can spell, honest.
 2016-09-15 15:16:06 +01:00
Promofaux
a3ef9efd2f remove updateDashboard script 2016-09-12 19:09:19 +01:00
Promofaux
95ee3216c4 Add the newer pihole command tags to the bash auto complete! 2016-09-06 21:57:17 +01:00
Adam Warner
eb201b614a Change log flush time to 00:00 2016-09-06 19:29:30 +01:00
Adam Warner
8cb2f85a08 Replace truncate command with echo " " > 2016-09-02 16:39:34 +01:00
Promofaux
01a9534729 Merge branch 'development' into UpdateMethod 
# Conflicts:
#	automated install/basic-install.sh
 2016-08-30 19:32:40 +01:00
Promofaux
b3e7619048 curly brackets all the variables! 2016-08-21 02:12:02 +01:00
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.
 2016-08-19 20:45:17 -04:00
Adam Warner
95edb49bb8 Add option for uploading debug log to termbin 2016-08-05 12:47:57 +01:00
Promofaux
e11ef5a7f0 Add version display script. Also checks current version on web and reports version. 2016-08-02 20:07:09 +01:00
diginc
5fb6c5b012 Making the whitelist re-block echo consistent with other WL/BL echos 2016-07-20 12:53:31 -05:00
diginc
3affa73257 Only re-block whitelist deletions if in adlists 
* Prevent blocking benign/untracked domains deleted off whitelist
* Issue #581
 2016-07-20 12:43:30 -05:00
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.
 2016-07-15 22:46:21 -07:00
Promofaux
61ff12e8d4 Change header to match the rest of the scripts. 2016-07-15 21:17:16 +01:00