49a56cf131
Start on new versioning
2016-01-29 08:25:35 -05:00
cadc506aa5
Remove extraneous whitespace from basic-install.sh
2016-01-28 09:25:00 +00:00
eee0ccef8c
Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---pihole-system-user-v2
2016-01-27 22:44:14 -05:00
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
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
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
3d78b44a8e
Changes as in #253 , but with less commits to keep the repo tidy
2016-01-27 22:32:08 +00:00
701ae06e4a
Move copying of adlists.default to gravity.sh
2016-01-27 21:14:06 +00:00
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
ae336da7a1
Fix formatting, use consistent style, add comments
...
Fix formatting, use consistent style, add comments
2016-01-27 01:11:38 -05:00
ef99fe2d18
Add line to copy default ad list into /etc/pihole
2016-01-26 20:33:49 +00:00
80bec9c5cf
Delete install
...
Not sure how this got in here... :)
2016-01-25 16:28:26 +00:00
2b99fa81f3
Tidy up output lines around new code
2016-01-25 16:08:48 +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
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
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
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
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
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
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
e8b8fb0835
s
2016-01-23 00:23:32 +00:00
6663ced38d
Initial commit
2016-01-23 00:13:16 +00:00
c99a8a9b15
initial commit
2016-01-22 20:30:32 +00:00
ea0fb15ff2
Move creation of pihole directory out of IPv6 function
2016-01-22 19:48:55 +00:00
05a59b17be
Changed URLs in installScripts() to match new organisation links
2016-01-22 16:50:01 +00:00
ce578534fe
Fixing minor typos in basic-install.sh
2016-01-21 11:33:49 -06:00
3f40a95929
Whoops, should probably commit more often. Massive overhaul. Cleaned up output, less verbose (will still output errors, but gets rid of anything not needed) Added a spinner so users don't think it has stalled
2016-01-20 23:34:18 +00:00
5c25c42da8
Make installPiholeWeb() more inteliigent. Checks for existence of /var/www/html/pihole, and only downloads from repo if it does not exist. Will stop install script from overwriting any tweaks users have made to index.html
2016-01-20 22:14:17 +00:00
96011bc2ae
make InstallWebAdmin() a bit more intelligent, and less verbose. Checks if installing over an existing installation, and if so, will remove existing webadmin folder.
2016-01-20 22:02:54 +00:00
4f59577fd1
Remove SUDO from line that runs gravity.sh to stop files in /etc/pihole being owned by root
2016-01-20 21:20:52 +00:00
Mcat12