ae336da7a1
Fix formatting, use consistent style, add comments
...
Fix formatting, use consistent style, add comments
2016-01-27 01:11:38 -05:00
4a61b80dd6
Update adlists.default
...
Add new line to end of file.. Github was complaining
2016-01-26 23:14:38 +00:00
ef99fe2d18
Add line to copy default ad list into /etc/pihole
2016-01-26 20:33:49 +00:00
352ebc3193
outsource list of adlists to a file in /etc/pihole/.
2016-01-26 20:26:09 +00:00
556799428c
Contains default adlists.
2016-01-26 20:22:29 +00:00
0b077b9601
Merge pull request #244 from pi-hole/development
...
Code update for 2016/01/25.
2016-01-25 11:04:09 -08:00
80bec9c5cf
Delete install
...
Not sure how this got in here... :)
2016-01-25 16:28:26 +00:00
c24685c49a
Merge pull request #243 from pi-hole/HotFix/InstallScript
...
Hot fix/install script
2016-01-25 16:22:36 +00:00
2b99fa81f3
Tidy up output lines around new code
2016-01-25 16:08:48 +00:00
e87443b3e4
add ' http://mirror1.malwaredomains.com/files/justdomains ' to list of ad-list sources, can be removed if it causes problems
2016-01-25 15:53:49 +00:00
74ea597bd8
Cosmetic enhancement. Add the domain 'Pi-Hole.IsWorking.OK' to the top of the domain list to return a friendlier looking domain when pinging a blocked host!
2016-01-25 15:52:22 +00:00
354a42dd00
close quotes on line 318!!!
2016-01-25 12:49:04 +00:00
4cedca3427
add in a prompt to give users the option to quit installation or continue
2016-01-25 12:47:03 +00:00
e99be28a73
Variable missing $
2016-01-25 02:31:03 -08:00
32389e4ab8
Terminate string with missing quote
2016-01-25 02:27:44 -08:00
01d7fc0ac9
Removed apt-get update/upgrade, instead checking for updates availible and advising user to update/upgrade after installation of pi-hole. Addresses issue #218
2016-01-25 10:07:12 +00:00
d74c8261aa
dnsFile2="/etc/dnsmasq.conf.orig"
...
added .orig
2016-01-25 01:38:41 -05:00
ac373545d0
versionCheckDNSmasq() fixups
...
versionCheckDNSmasq() fixups per dschaper's suggestions.
2016-01-25 01:27:10 -05:00
a21948d2c6
Typo fix
...
Typo fix
2016-01-25 01:09:45 -05:00
940480effe
Revert "Fix backup to use new 01-pihole.conf location"
...
This reverts commit 0c444e6f2b
2016-01-25 00:57:36 -05:00
29c593b8b0
Add user pihole if user does not exsist
...
Check if user pihole exist and add if not. This will give pihole its
own system user without a login or home directory that is not system
dependent.
2016-01-25 00:28:53 -05:00
0c444e6f2b
Fix backup to use new 01-pihole.conf location
...
Fix backup to use new 01-pihole.conf location
2016-01-25 00:12:51 -05:00
6cf6e16d22
Add ability to choose upstream DNS servers
...
Give the user the ability to choose between Google and DynDNS upstream
servers. Then insert the chosen DNS servers in to
/etc/dnsmasq.d/01-pihole.conf. Todo: extend choices to include manually
entered DNS servers.
2016-01-25 00:11:00 -05:00
abef758ff6
Get ready for user selected DNSs
...
Prep for using sed to insert user selected DNSs into 01-pihole.conf.
Selections will come from dialog during install script containing the
following choices: Google, DynDNS, and eventually 2 custom DNS servers.
2016-01-25 00:05:17 -05:00
e5f9663a0e
Move dnsmasq.conf to dnsmasq.d/01-pihole.conf
...
Check if /etc/dnsmasq.conf is from pihole. If so, replace with an
original and install new in .d directory. Add and unmolested version of
dnsmasq.conf to the ./advanced directory.
2016-01-25 00:04:02 -05:00
ff5ed561cc
Rename dnsmasq.conf to 01-pihole.conf
...
Rename dnsmasq.conf to 01-pihole.conf to prepare for move to
/etc/dnsmasq.d/ per the normal way of modding configs on Debian based
systems.
2016-01-24 23:54:00 -05:00
6b76270889
Remove spinner call when adding URLs of adlist to array.. seems to break it.
2016-01-24 22:30:12 +00:00
5d040f45c8
Merge pull request #239 from pi-hole/development
...
Development
2016-01-24 22:12:04 +00:00
cebdcc71a7
Add $SUDO call to spinner() in gravity.sh
2016-01-24 21:27:25 +00:00
eec14be10d
add $SUDO into spinner control.
2016-01-24 21:19:23 +00:00
c179936b54
add $SUDO
2016-01-24 20:49:37 +00:00
649a565801
run apt-get install as sudo when resolving dependencies
2016-01-24 20:35:24 +00:00
2d4ebf5eb5
FIX CONFLICTS
2016-01-24 20:29:22 +00:00
754beed3a1
Bring up to date with master
2016-01-24 20:22:41 +00:00
df5059944b
Merge branch 'Promofaux-InstallRework' into development
2016-01-24 18:51:10 +00:00
9f0927351d
Merge from #236
2016-01-24 18:49:25 +00:00
736edf44e4
Added date check before running apt-get update/upgrade. Wont run apt-get update/upgrade if it has already been run today
2016-01-24 17:53:27 +00:00
8ecf8eb76c
output to match other scripts
2016-01-24 17:18:37 +00:00
3cd1a5b1d5
... Helps if I add the changes to the repo file, and not the test file on my pi.
2016-01-24 16:51:54 +00:00
39507b9d0d
Added echo ':::' to the top of the file
2016-01-24 16:47:38 +00:00
dfcf9d133e
Make output make a bit more sense
2016-01-24 16:46:00 +00:00
8a74942da7
Cleaned up output before running gravity.sh
2016-01-24 16:41:11 +00:00
2fe42138c7
removed a space
2016-01-24 16:37:15 +00:00
1563146918
improvements to git functions (passing parameters). Added >/dev/null to attempt to supress output from apt-get upgrade
2016-01-24 16:33:53 +00:00
cf3aea8075
uncomment the apt-get update/upgrade!
2016-01-24 15:27:40 +00:00
a539dc41f3
Tidy up gravity output to match install script
2016-01-24 15:25:24 +00:00
6cea480210
Huge update! Base files now cloned from github (or updated if already existing) and copied out to the correct directories. Web admin interface is now cloned from hithub (or updated if already existing). Packages are checked before we go ahead and try to install them anyway.
2016-01-24 03:31:12 +00:00
3b4bb48a0f
Merge pull request #234 from ChadBHowell/CBH---Dependencies
...
Add unzip to the dependencies
2016-01-24 00:13:49 +00:00
206717828b
Improve spinner function.
2016-01-23 22:25:30 +00:00
316d26ede2
Add unzip to the dependencies
...
unzip is required for the install script to complete. Some distros do
not have it installed by default.
2016-01-23 16:29:52 -05:00
