arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity

Cherry picking f6f6f6d, conflict fix

Browse Source
This commit is contained in:
Adam Warner 2016-11-02 09:33:17 +00:00 committed by Dan Schaper
parent 354309fcad
commit 3df2ef8587
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
automated install/basic-install.sh
View File

@ -932,18 +932,19 @@ accountForRefactor() {
} }
updatePihole() { updatePihole() {
accountForRefactor accountForRefactor
# Source ${setupVars} for use in the rest of the functions. # Source ${setupVars} for use in the rest of the functions.
. ${setupVars} . ${setupVars}
# Install base files and web interface # Install base files and web interface
installScripts installScripts
installConfigs installConfigs
CreateLogFile CreateLogFile
configureSelinux configureSelinux
installPiholeWeb installPiholeWeb
installCron installCron
configureFirewall configureFirewall
runGravity finalExports #re-export setupVars.conf to account for any new vars added in new versions
runGravity
} }
configureSelinux() { configureSelinux() {