Update with new sequencer features

This commit is contained in:
2019-12-09 23:40:15 +01:00
parent 07fcd28545
commit 982d34815f
3 changed files with 54 additions and 60 deletions

View File

@@ -9,14 +9,13 @@ phpName="php$phpVersion"
phpPackages="${phpName}-fpm ${phpName}-json ${phpName}-mysql ${phpName}-curl ${phpName}-intl ${phpName}-gd ${phpName}-zip ${phpName}-xml ${phpName}-mbstring php-imagick php-apcu"
step_1_info() { echo -e "Installation of $serverName and ${databaseName} packages:\n $serverPackages $databasePackages"; }
step_1_alias() { ALIAS=install; }
step_1_alias() { ALIAS="install"; }
step_1() {
exe apt update
exe apt install $databasePackages
saveReturn $?
endReturn
endReturn -o $? "Database package installation error"
exe apt install $serverPackages
saveReturn $?
endReturn -o $? "Server package installation error"
}
step_2_info() { echo "Basic nginx configuration for initial letsencrypt certificate creation"; }
@@ -36,10 +35,9 @@ step_2() {
# create webroot
exe mkdir -p "$siteLetsencryptWww"
echo -n "Restarting Nginx ... "
echo -n " [I] Restarting Nginx ... "
exe service nginx restart && echo "ok"
saveReturn $?
endReturn
endReturn -o $? "Nginx error during startup"
}
snippetLetsencryptLoc="/etc/nginx/snippets/letsencrypt.conf"
@@ -65,8 +63,10 @@ step_4_info() { echo "Mariadb configuration"; }
step_4() {
addConf -c "$mariadbConfig" "$mariadbConfigLoc"
echo -n "Restarting mysql ... "
exe service mysql restart && echo "ok"
echo -n " [I] Restarting mysql ... "
exe service mysql restart
endReturn -o $? "Mariadb error during startup"
echo "ok"
}
mariadbConfigLoc="/etc/mysql/mariadb.conf.d/90-myconfig.cnf"
@@ -83,6 +83,7 @@ lower_case_table_names=0
step_5_info() { echo -e "Installation of $phpName packages:\n $phpPackages"; }
step_5() {
exe apt install $phpPackages
endReturn -o $? "$phpName error during startup"
}
phpFpmConfigLocation="/etc/php/${phpVersion}/fpm/conf.d/90-custom_pi.ini"
@@ -111,8 +112,10 @@ step_6() {
addConf -c "$phpFpmConfig" "$phpFpmConfigLocation"
addConf -c "$phpCliConfig" "$phpCliConfigLocation"
echo -n "Restarting ${phpName} ... "
exe service ${phpName}-fpm restart && echo "ok"
echo -n "Restarting ${phpName} ..."
exe service ${phpName}-fpm restart
endReturn -o $? "$phpName error during restart"
echo "ok"
}
step_10_info() { echo -e "Create mysql database without specific characterset\n"; }
@@ -184,6 +187,6 @@ step_12() {
exe mysql -u root -e 'FLUSH PRIVILEGES;'
}
VERSION_SEQREV=3
VERSION_SEQREV=7
. sequencer.sh