Commit graph

239 commits

Author SHA1 Message Date
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
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
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