nate
f2150ee7e1
Merge conflict resolution
2016-03-28 13:07:51 -05:00
nate
eaf89995ee
Merge conflict resolution
2016-03-28 12:59:45 -05:00
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
2016-03-28 12:58:44 -05:00
nate
a4fbccac9b
Merge conflict resolution
2016-03-28 12:53:21 -05:00
nate
a0cf93a7ca
Merge branch 'PiholeDebug'
...
Conflicts:
README.md
2016-03-28 12:22:42 -05:00
nate
f444c7d4a5
Merge resolution
2016-03-28 12:21:49 -05:00
nate
8ef4c12f97
Merge branch 'ScriptCleanup'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-28 12:21:18 -05:00
nate
c520c55ff4
Addressed UAT issues and moved scripts to /opt/pihole
...
Symlinks now include the /etc/pihole scripts in the user's PATH.
2016-03-28 10:24:13 -05:00
nate
6145748bfb
Change single echo to printf to forrect \t interpretation
2016-03-27 20:36:31 -05:00
nate
1a1026b367
Consistent stdout to match basic-install.sh and uninstall.sh
2016-03-27 14:44:42 -05:00
Nate
8c45bd32b7
Loop through dependencies for future expansion.
...
Syntax of uninstall script now matches basic-install.sh.
More error handling of missing default files.
Force user prompt for removing packages when uninstalling.
2016-03-27 12:31:05 -05:00
Nate
2b5cee05e6
Check for existing directory before trying to perform operations on it.
2016-03-27 10:59:09 -05:00
Nate
5442954db6
Prompt user to remove each dependent package if they do choose to remove packages at all.
2016-03-27 10:58:48 -05:00
nate
5ee382c8eb
Roll back addition of piholeDebug.sh (production master base)
2016-03-26 17:00:52 -05:00
Nate
901cb44f5e
Added /etc/.pihole/ and /var/log/*pihole* to uninstall as well as fixed missing call to removeNoPurge.
2016-03-26 16:57:34 -05:00
Nate
7388461ede
Modularized uninstall for cleanliness and robust usability.
2016-03-26 16:57:27 -05:00
nate
5223627b71
read locks echos... reordered to warn user
2016-03-26 16:57:22 -05:00
nate
646c4a3ccc
Newline not read correctly in prompt
2016-03-26 16:57:17 -05:00
nate
0b9e78df2c
Cleaned code and added prompt for purge on uninstall
2016-03-26 16:57:01 -05:00
nate
a9c24b456d
Bug fixes and logging improvements
...
Finalized for production deployment. Next release targeting a tarball of config files plus additional logging.
2016-03-25 19:04:03 -05:00
nate
b4463bf42c
Added test for nslookup
...
Checks the TESTURL for nslookup is not whitelisted
2016-03-25 16:42:17 -05:00
nate
8f8dc66c70
Ignore whitespace when writing config files
2016-03-24 18:50:53 -05:00
Nate
b746250e71
Made all advanced/Scripts/ executable for consistency.
2016-03-24 18:29:13 -05:00
Promofaux
26b7e7ec8e
Merge lighttpd JS changes into development
2016-03-24 23:21:11 +00:00
Promofaux
bc09760c84
Grab changes by @rosskevin. ( #386 - lighttpd changes to handle JS files)
2016-03-24 23:19:44 +00:00
Promofaux
ceb229c6ac
Merge branch 'master' into development
2016-03-24 23:18:40 +00:00
Promofaux
1e6ac33ef1
Fix merge conflicts
2016-03-24 23:18:14 +00:00
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
2016-03-24 16:21:29 -05:00
nate
00f46dc149
Added Pi 3B to README.md
2016-03-23 14:56:27 -05:00
Jacob Salmela
396c7ab9ee
link to tekthing mention
...
tekthing mentioned us again as one of 5 easy projects for the Raspberry Pi.
2016-03-22 21:21:08 -05:00
Jacob Salmela
fa2cef6395
link to get LED alerts article
...
added a link to a cool project that makes an LED blink for each ad that gets blocked.
2016-03-21 08:29:19 -05:00
nate
04638c9065
Added 01-pihole.conf from /etc/dnsmasq.d/ to log
...
Write 01-pihole.conf to debug log
2016-03-20 18:21:35 -05:00
Adam Warner
02bb5b6742
Revert previous change
...
Reopens #384
2016-03-20 20:50:31 +00:00
Adam Warner
fad5fafa32
Increase disk space to verify...
...
.. was missing a couple of zeros, and not verifying enough space!
Fixes #384
2016-03-20 13:26:02 +00:00
nate
b0dd231018
Modified description in header
...
Removed copied header description from piholeLogFlush.sh and replaced with relevant description.
2016-03-19 21:34:02 -05:00
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.
2016-03-19 20:32:11 -05:00
Mcat12
babca8d47b
Merge pull request #389 from pi-hole/feature/httpsPull
...
Secure Pulls now with HTTPS
2016-03-16 08:19:39 -04:00
Dan Schaper
eb462955fe
Secure Pulls now with HTTPS
...
Closes #310
2016-03-16 05:06:03 -07:00
Kevin Ross
b79db36336
no need for the X- header prefix in the string
2016-03-14 22:59:38 -05:00
Kevin Ross
404ea0ce6d
copy both the html and js stubs during install
2016-03-14 22:54:45 -05:00
Kevin Ross
d3971b26e4
add a valid js stub
2016-03-14 22:52:02 -05:00
Kevin Ross
a44a201f00
rewrite js files to a valid stub
2016-03-14 22:51:16 -05:00
Mcat12
1d80fdddd4
Merge pull request #372 from Morlok8k/development
...
fix for older versions of uptime, on development branch.
2016-03-11 15:51:18 -05:00
Mcat12
f09745b4ad
Update README.md
2016-03-08 16:28:45 -05:00
Morlok8k
d13ae0610e
fix for older versions of uptime, on development branch.
2016-03-08 10:19:01 -08:00
Dan Schaper
3eaa447323
Merge pull request #369 from jpsingleton/development
...
Optionally block the BBC Breaking News banner
2016-03-08 00:28:18 -08:00
Mcat12
604506da10
Merge pull request #370 from stejoo/development
...
Fix URL for Windows 10 Telemetry list.
2016-03-07 18:31:56 -05:00
Stefan Joosten
122ce11381
Fix URL for Windows 10 Telemetry list.
2016-03-08 00:23:39 +01:00
James Singleton
8cbd9f7f08
Optionally block the BBC Breaking News banner
2016-03-07 13:31:50 +00:00
Dan Schaper
7c41e5bafc
Merge pull request #367 from yoosi/fix-trailling-whitespace
...
Fix trailing whitespace
2016-03-05 23:17:31 -08:00
