Sergio G
beb6b950f7
Replaced 'sudo' with
2016-02-08 22:26:41 +01:00
Adam Warner
c93c4cc5e6
Update basic-install.sh
...
ahem
2016-02-01 22:28:35 +00:00
Promofaux
06cba7defd
Fix script output around new changes
2016-02-01 22:25:28 +00:00
Promofaux
8b76bbe51d
Merge github.com:pi-hole/pi-hole
2016-02-01 22:19:37 +00:00
Promofaux
aa1d3a4c2e
Fix logic in versionCheckDNSmasq, as dnsmasq.conf was being overwritten every time install was run. Fixes @kmr2319 's concern in #98
2016-02-01 22:19:17 +00:00
Dan Schaper
38e73a188a
Fix array selection
2016-02-01 02:11:55 +00:00
Dan Schaper
3fdf588cc9
Costmetic fixes, change DynDNS to OpenDNS
2016-02-01 02:09:11 +00:00
Promofaux
70e4104c17
Merge remote-tracking branch 'origin/development'
2016-01-31 20:47:10 +00:00
Promofaux
29e0e1760b
Fixes #154 #269 . No need for PR #214 any more.
2016-01-31 20:39:12 +00:00
Chad Howell
5060ed8970
Add error checking for grep and correct typos
2016-01-30 20:51:28 -05:00
Dan Schaper
d18e064d21
Remove no longer needed change to config file
...
Config file moved, no longer needed command removed.
2016-01-30 16:30:38 -08:00
Mcat12
0cfb3c7ab4
Fixed config issue
2016-01-30 19:21:31 -05:00
Mcat12
48f9a61ff0
Updated License
2016-01-30 15:12:40 -05:00
Mcat12
0042e3ae02
Merge branch 'development' into CBH/UpstreamDNS
...
Conflicts:
automated install/basic-install.sh
2016-01-30 13:28:01 -05:00
Adam Warner
b93e46de14
Update basic-install.sh
2016-01-30 14:55:02 +00:00
Promofaux
9e0c7ed29a
Merging from CBH bugfix
2016-01-30 14:34:12 +00:00
Adam Warner
21a07e7419
Merge pull request #263 from pi-hole/newVersioning
...
New versioning system
2016-01-29 20:47:10 +00:00
Adam Warner
6b50ea6504
Merge pull request #249 from pi-hole/OperationBlockListFromGravity
...
Seperate blocklist sources from gravity.sh to allow users to manage their own list of blocklists that persists through installs/upgrades
2016-01-29 19:39:11 +00:00
Mcat12
895647b908
Don't copy version to install dir
2016-01-29 12:32:58 -05:00
Mcat12
0ece58b9cb
Add version
2016-01-29 12:23:03 -05:00
Mcat12
49a56cf131
Start on new versioning
2016-01-29 08:25:35 -05:00
Dan Schaper
cadc506aa5
Remove extraneous whitespace from basic-install.sh
2016-01-28 09:25:00 +00:00
Chad Howell
088bd632ab
Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---Descrition-for-pi-hole-v1-back-function
...
# Conflicts:
# automated install/basic-install.sh
2016-01-27 22:43:43 -05:00
PromoFaux
60bf14d4dd
Merge pull request #255 from pi-hole/Bugfix/InstallScriptFix
...
Force apt-get update if it has not been run today. This will stop dependency errors on a fresh install.
2016-01-27 23:43:38 +00:00
Promofaux
c00fb44cee
Do not force apt-get upgrade on the user. Instead, advise them. We only need to make sure apt-get update has been run
2016-01-27 23:28:36 +00:00
Promofaux
3d78b44a8e
Changes as in #253 , but with less commits to keep the repo tidy
2016-01-27 22:32:08 +00:00
Promofaux
701ae06e4a
Move copying of adlists.default to gravity.sh
2016-01-27 21:14:06 +00:00
PromoFaux
98a0d17431
Update basic-install.sh
...
Emergency Bug fix. I take the blame for this one, it got lost in a merge!
2016-01-27 15:28:40 +00:00
Chad Howell
ae336da7a1
Fix formatting, use consistent style, add comments
...
Fix formatting, use consistent style, add comments
2016-01-27 01:11:38 -05:00
Promofaux
ef99fe2d18
Add line to copy default ad list into /etc/pihole
2016-01-26 20:33:49 +00:00
Adam Warner
2b99fa81f3
Tidy up output lines around new code
2016-01-25 16:08:48 +00:00
Adam Warner
354a42dd00
close quotes on line 318!!!
2016-01-25 12:49:04 +00:00
Adam Warner
4cedca3427
add in a prompt to give users the option to quit installation or continue
2016-01-25 12:47:03 +00:00
Dan Schaper
e99be28a73
Variable missing $
2016-01-25 02:31:03 -08:00
Dan Schaper
32389e4ab8
Terminate string with missing quote
2016-01-25 02:27:44 -08:00
Adam Warner
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
Chad Howell
d74c8261aa
dnsFile2="/etc/dnsmasq.conf.orig"
...
added .orig
2016-01-25 01:38:41 -05:00
Chad Howell
ac373545d0
versionCheckDNSmasq() fixups
...
versionCheckDNSmasq() fixups per dschaper's suggestions.
2016-01-25 01:27:10 -05:00
Chad Howell
a21948d2c6
Typo fix
...
Typo fix
2016-01-25 01:09:45 -05:00
Chad Howell
940480effe
Revert "Fix backup to use new 01-pihole.conf location"
...
This reverts commit 0c444e6f2b
2016-01-25 00:57:36 -05:00
Chad Howell
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
Chad Howell
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
Chad Howell
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
Promofaux
eec14be10d
add $SUDO into spinner control.
2016-01-24 21:19:23 +00:00
Promofaux
c179936b54
add $SUDO
2016-01-24 20:49:37 +00:00
Promofaux
649a565801
run apt-get install as sudo when resolving dependencies
2016-01-24 20:35:24 +00:00
Promofaux
2d4ebf5eb5
FIX CONFLICTS
2016-01-24 20:29:22 +00:00
Promofaux
754beed3a1
Bring up to date with master
2016-01-24 20:22:41 +00:00
Promofaux
9f0927351d
Merge from #236
2016-01-24 18:49:25 +00:00
Promofaux
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
