diff --git a/installer.sh b/installer.sh index 3be3b23..086b990 100644 --- a/installer.sh +++ b/installer.sh @@ -69,8 +69,8 @@ NginxCMSL+=("Wordpress:" "WordPress is a content management system based on PHP. NginxCMSL+=("Nextcloud:" "Nextcloud is a suite of client-server software for creating and using file hosting services." OFF) #Options NginxOptions=("Option 1:" "Option 1 Desription" OFF) -NginxOptions+=("Option 2: " "Option 2 Desription" OFF) -NginxOptions+=("Option 3: " "Option 3 Desription" OFF) +NginxOptions+=("Option 2:" "Option 2 Desription" OFF) +NginxOptions+=("Option 3:" "Option 3 Desription" OFF) ##Apache #CMSList @@ -87,15 +87,21 @@ webservers=("Nginx" "Apache" "Quit") #CMSList NginxCMSL=("Wordpress" "Nextcloud" "None") #Options -NginxOptions=("Option 1" "Ngx Option 2") +NginxOptions=("Ngx Option 1:" "Ngx Option 2:" "Ngx Option 3:") + ##Apache #CMSList ApacheCMSL=("Wordpress" "Nextcloud" "None") #Options -ApacheOptions=("Option 1" "Apa Option 2") +ApacheOptions=("Apa Option 1:" "Apa Option 2:" "Apa Option 3:") fi +##---------------------## +# Always-on modules # +##---------------------## +aonoption="/MySQL/" +aonoption="$aonoption /Unattended-Security-Updates/" ##---------------## # Functions # @@ -334,12 +340,9 @@ done fi #Cleaning options from menu -option="${option,,}" && option="${option// /}" -#Always on option modules -option="$option /MySQL/" -option="$option /Unattended-Security-Updates/" -#Cleaning all options -option="${option/:/ }" && option="${option//:}" && option="${option//'"'}" +option="${option,,}" && option="${option// /}" && option="${option//:/ }" && option="${option//'"'}" +#Combining selected option with always-on options +option="$option""$aonoption" echo "Generating apt list for Options" for val1 in ${option[*]}; do @@ -539,4 +542,4 @@ fi # Services # ##------------## -systemctl restart sshd +systemctl restart sshd \ No newline at end of file