notracking
be79281418
Added hosts-blocklists lists
...
The hosts-blocklist is a semi-automatically updated list, based on various well known public sources, for more details read: https://github.com/notracking/hosts-blocklists/
Please be aware that one file is for domain blocking and the other file for hostname based blocking, these lists are complimentary and should therefore be used simultaneously.
2016-04-10 16:12:40 +08:00
Adam Warner
01f53f6d6c
Merge pull request #450 from pi-hole/SmallFixesToWhitelistBlacklist
...
Small fixes to whitelist blacklist
2016-04-08 23:03:30 +01:00
Promofaux
107e0404de
Move exit 1 outside of if block on verbose check to stop dnsmasq reloading
2016-04-08 23:01:13 +01:00
Promofaux
ab99e80333
indent
2016-04-08 23:00:46 +01:00
Promofaux
3154a378a6
Remove clear in DisplayWlist and force verbose to false to tidy up output.
2016-04-08 20:12:30 +01:00
Promofaux
8e04f1c03e
Remove clear in DisplayBlist and forse verbose to false to tidy up output.
2016-04-08 20:11:39 +01:00
Promofaux
c0aadeab3d
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:27 +01:00
Promofaux
6c87698f1a
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:10 +01:00
Adam Warner
db2e9f8bf3
Merge pull request #447 from 7h3ju57/issue#442
...
Add list option to blacklist and whitelist
2016-04-08 20:07:24 +01:00
Justin Theberge
9a4c5cef86
fix indentations
2016-04-08 10:14:17 -04:00
Justin Theberge
bdfc86f850
fix formatting
2016-04-07 21:58:57 -04:00
Justin Theberge
70dadfba28
add list options requested from issue#442
2016-04-07 21:52:47 -04:00
Adam Warner
01e1e34874
Merge pull request #441 from pi-hole/development
...
Pihole v2.6.1.2. Closes #439
2016-04-06 09:44:04 +01:00
Adam Warner
28a3cbfa87
Merge pull request #440 from pi-hole/Bugfix439
...
fixes #439
2016-04-06 09:42:07 +01:00
Adam Warner
0b480c2d3f
remove redundant else, add ! to if logic.
2016-04-06 09:36:41 +01:00
Adam Warner
391dea445a
Move help output to function, add -h argument
2016-04-06 09:34:05 +01:00
Adam Warner
e074c72130
Move help output to function helpFunc, add -h argument.
2016-04-06 09:32:36 +01:00
Adam Warner
96f3f863e5
Clean up output. Commented out un-needed root/sudo notification
2016-04-06 09:28:24 +01:00
Adam Warner
3877f6fd94
Fix arguments not being passed through to chronometer.sh
2016-04-06 09:27:46 +01:00
Adam Warner
cbbc6df05a
Merge pull request #425 from PiHoleController
...
Fixes spacing issues in whiptail dialogs
2016-04-05 22:26:02 +01:00
Adam Warner
32ff7fb321
Merge pull request #437 from pi-hole/development
...
Hotfix 2.6.1.1 - closes #434
2016-04-05 14:32:32 +01:00
Adam Warner
5537e57eec
Merge pull request #436 from pi-hole/2611Hotfix
...
Fixes #432 . Thanks to @VDRrulez and @jradwan for pointing it out...
2016-04-05 14:30:16 +01:00
Promofaux
9c94af04cc
Fixes #432 . Thanks to @VDRrulez and @jradwan for pointing it out...
2016-04-05 14:22:10 +01:00
Adam Warner
3f0b15902d
Merge pull request #432 from pi-hole/development
...
Hotfix 2.6.1
2016-04-05 08:56:28 +01:00
Adam Warner
4d3835dde2
Merge pull request #431 from pi-hole/261Hotfix
...
Correct variable name (Missing capital letter! whoops!)
2016-04-05 08:55:34 +01:00
Promofaux
8514f42d0d
Correct variable name (Missing capital letter! whoops!)
2016-04-05 08:53:52 +01:00
Adam Warner
6d9fbe8d41
Merge pull request #392 from pi-hole/development
...
Pi-hole v2.6
2016-04-05 00:30:20 +01:00
Promofaux
849185d3c9
Fix incorrect echo
2016-04-05 00:03:49 +01:00
Promofaux
47cc757ed0
Fix incorrect echo
2016-04-05 00:03:24 +01:00
Adam Warner
f6edd435af
Merge pull request #429 from pi-hole/white-black-piholeconf
...
Ensure all scripts honour pihole.conf
fixed small bug where source lists were being updated on every run of gravity
2016-04-04 23:52:11 +01:00
Promofaux
0c0dd914f7
Fix source lists not being skipped if they are already up to date
2016-04-04 23:48:34 +01:00
Promofaux
c6405bc93b
Ensure addn-hosts value is updated in /etc/dnsmasq.d/01-pihole.conf if user has a custom value set in pihole.conf
2016-04-04 23:38:46 +01:00
Promofaux
cdffdfbded
merge master > development
2016-04-04 22:18:53 +01:00
Promofaux
0bbfb323b1
make whitelist honour pihole.conf file
2016-04-04 21:08:56 +01:00
Promofaux
4f08359786
Make blacklist honour pihole.conf file
2016-04-04 21:08:45 +01:00
Adam Warner
7efb17537a
Merge pull request #427 from pi-hole/SystemctlDebugLogging
...
Write verbose status of processes to debug log & Minor UI Fixes
2016-04-04 14:59:22 +01:00
nate
7e06769d44
Double quoting
2016-04-04 01:03:05 -05:00
nate
5347ee4896
Write verbose status of processes to debug log & Minor UI Fixes
2016-04-04 00:59:24 -05:00
nate
834bf30a10
Merged branch development into PiHoleController
2016-04-03 18:05:19 -05:00
nate
22ea384ac8
Fix whiptail spacing
2016-04-03 18:05:11 -05:00
Adam Warner
3e6dd9ea9e
Merge pull request #424 from pi-hole/PiHoleController
...
Indentation fix
2016-04-03 23:28:03 +01:00
nate
10f363e9e7
Merged branch development into PiHoleController
2016-04-03 17:26:37 -05:00
nate
69e8c014c3
Indentation fix
2016-04-03 17:25:48 -05:00
Adam Warner
dbb40e1dda
Merge pull request #416 from pi-hole/PiHoleController
...
Add in Pi hole controller
2016-04-03 23:15:00 +01:00
Promofaux
d710b97276
Fix issue raised in #421 (Use variable instead of hardcoded path, do not delete user created pihole.conf!)
2016-04-03 22:10:04 +01:00
Promofaux
0e6e8040ba
Change spinstr to match install and uninstall scripts
2016-04-03 21:54:16 +01:00
Promofaux
c6fb0bad4b
change spinstr to match spinstr in basic-install.sh
2016-04-03 21:45:00 +01:00
Promofaux
2d08217173
Tidy up For loops, clean up whitespace
2016-04-03 21:43:36 +01:00
Promofaux
36645d9335
Add check for existing files in /usr/local/bin left over from previous version, as those scripts are replaced with pihole <command> script.
2016-04-03 18:39:22 +01:00
Promofaux
97d3aedba1
Add some output to the log flush
2016-04-03 18:27:18 +01:00
