borekon/1st_run
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update setup.sh

Browse Source 
Command pause does not exist. Replaced with read -p
GPG key was not added correctly
This commit is contained in:
borekon 2022-03-14 13:43:10 +01:00
parent d5fc129893
commit 4fb7e85f61
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
setup.sh
View File

@ -45,9 +45,10 @@ case ${answer:0:1} in
${SUDO} sh -c 'echo "deb https://download.webmin.com/download/repository sarge contrib" > /etc/apt/sources.list.d/webmin.list' ${SUDO} sh -c 'echo "deb https://download.webmin.com/download/repository sarge contrib" > /etc/apt/sources.list.d/webmin.list'
wget https://download.webmin.com/jcameron-key.asc wget https://download.webmin.com/jcameron-key.asc
${SUDO} sudo gpg --dearmor jcameron-key.asc ${SUDO} sudo gpg --dearmor jcameron-key.asc
${SUDO} sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys d97a3ae911f63c51
rm jcameron-key.asc rm jcameron-key.asc
${SUDO} apt update && ${SUDO} apt install webmin && WEBMIN=1 ${SUDO} apt update && ${SUDO} apt install webmin && WEBMIN=1
pause read -p "Press any key to continue"
;; ;;
* ) * )
echo -e Webmin "${BOLDRED} NOT${ENDCOLOR}" installed echo -e Webmin "${BOLDRED} NOT${ENDCOLOR}" installed
@ -60,7 +61,7 @@ case ${answer:0:1} in
cd "Pi-hole/automated install/" cd "Pi-hole/automated install/"
bash basic-install.sh bash basic-install.sh
pihole -a -p pihole -a -p
pause read -p "Press any key to continue"
;; ;;
* ) * )
echo -e PiHole "${BOLDRED} NOT${ENDCOLOR} " installed echo -e PiHole "${BOLDRED} NOT${ENDCOLOR} " installed
@ -76,11 +77,11 @@ if [[ $WEBMIN != 0 ]]
${SUDO} ln -s /etc/letsencrypt/live/$HOSTNAME/combined.pem /etc/webmin/miniserv.pem ${SUDO} ln -s /etc/letsencrypt/live/$HOSTNAME/combined.pem /etc/webmin/miniserv.pem
${SUDO} systemctl start webmin ${SUDO} systemctl start webmin
else else
echo No #echo No
fi fi
if [[ -d "/etc/lighttpd" ]] if [[ -d "/etc/lighttpd" ]]
then then
read -p "Request let\'s encrypt certificate for lighttpd(y/n)" answer read -p "Request let's encrypt certificate for lighttpd(y/n)" answer
case ${answer:0:1} in case ${answer:0:1} in
y|Y ) y|Y )
echo -e "${ITALICGREEN}Stopping lighttpd${ENDCOLOR}" echo -e "${ITALICGREEN}Stopping lighttpd${ENDCOLOR}"
@ -108,5 +109,5 @@ if [[ -d "/etc/lighttpd" ]]
;; ;;
esac esac
else else
echo No #echo No
fi fi