Promofaux
8b76bbe51d
Merge github.com:pi-hole/pi-hole
9 years ago
Promofaux
aa1d3a4c2e
Fix logic in versionCheckDNSmasq, as dnsmasq.conf was being overwritten every time install was run. Fixes @kmr2319 's concern in #98
9 years ago
Dan Schaper
38e73a188a
Fix array selection
9 years ago
Dan Schaper
3fdf588cc9
Costmetic fixes, change DynDNS to OpenDNS
9 years ago
Promofaux
70e4104c17
Merge remote-tracking branch 'origin/development'
9 years ago
Promofaux
29e0e1760b
Fixes #154 #269 . No need for PR #214 any more.
9 years ago
Chad Howell
5060ed8970
Add error checking for grep and correct typos
9 years ago
Dan Schaper
d18e064d21
Remove no longer needed change to config file
...
Config file moved, no longer needed command removed.
9 years ago
Mcat12
0cfb3c7ab4
Fixed config issue
9 years ago
Mcat12
48f9a61ff0
Updated License
9 years ago
Mcat12
0042e3ae02
Merge branch 'development' into CBH/UpstreamDNS
...
Conflicts:
automated install/basic-install.sh
9 years ago
Adam Warner
b93e46de14
Update basic-install.sh
9 years ago
Promofaux
9e0c7ed29a
Merging from CBH bugfix
9 years ago
Adam Warner
21a07e7419
Merge pull request #263 from pi-hole/newVersioning
...
New versioning system
9 years ago
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
9 years ago
Mcat12
895647b908
Don't copy version to install dir
9 years ago
Mcat12
0ece58b9cb
Add version
9 years ago
Mcat12
49a56cf131
Start on new versioning
9 years ago
Dan Schaper
cadc506aa5
Remove extraneous whitespace from basic-install.sh
9 years ago
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
9 years ago
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.
9 years ago
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
9 years ago
Promofaux
3d78b44a8e
Changes as in #253 , but with less commits to keep the repo tidy
9 years ago
Promofaux
701ae06e4a
Move copying of adlists.default to gravity.sh
9 years ago
PromoFaux
98a0d17431
Update basic-install.sh
...
Emergency Bug fix. I take the blame for this one, it got lost in a merge!
9 years ago
Chad Howell
ae336da7a1
Fix formatting, use consistent style, add comments
...
Fix formatting, use consistent style, add comments
9 years ago
Promofaux
ef99fe2d18
Add line to copy default ad list into /etc/pihole
9 years ago
PromoFaux
80bec9c5cf
Delete install
...
Not sure how this got in here... :)
9 years ago
Adam Warner
2b99fa81f3
Tidy up output lines around new code
9 years ago
Adam Warner
354a42dd00
close quotes on line 318!!!
9 years ago
Adam Warner
4cedca3427
add in a prompt to give users the option to quit installation or continue
9 years ago
Dan Schaper
e99be28a73
Variable missing $
9 years ago
Dan Schaper
32389e4ab8
Terminate string with missing quote
9 years ago
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
9 years ago
Chad Howell
d74c8261aa
dnsFile2="/etc/dnsmasq.conf.orig"
...
added .orig
9 years ago
Chad Howell
ac373545d0
versionCheckDNSmasq() fixups
...
versionCheckDNSmasq() fixups per dschaper's suggestions.
9 years ago
Chad Howell
a21948d2c6
Typo fix
...
Typo fix
9 years ago
Chad Howell
940480effe
Revert "Fix backup to use new 01-pihole.conf location"
...
This reverts commit 0c444e6f2b
.
9 years ago
Chad Howell
0c444e6f2b
Fix backup to use new 01-pihole.conf location
...
Fix backup to use new 01-pihole.conf location
9 years ago
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.
9 years ago
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.
9 years ago
Promofaux
eec14be10d
add $SUDO into spinner control.
9 years ago
Promofaux
c179936b54
add $SUDO
9 years ago
Promofaux
649a565801
run apt-get install as sudo when resolving dependencies
9 years ago
Promofaux
2d4ebf5eb5
FIX CONFLICTS
9 years ago
Promofaux
754beed3a1
Bring up to date with master
9 years ago
Promofaux
9f0927351d
Merge from #236
9 years ago
Promofaux
736edf44e4
Added date check before running apt-get update/upgrade. Wont run apt-get update/upgrade if it has already been run today
9 years ago
Promofaux
8a74942da7
Cleaned up output before running gravity.sh
9 years ago
Promofaux
2fe42138c7
removed a space
9 years ago