Used sequpgrade.sh to upgrade existing seqs

seqs/librenms.sh

@@ -23,19 +23,19 @@ SCRIPT_NAME=${SCRIPT_NAME%%.*}
 CONFIG_FILE_NAME="${SCRIPT_NAME}.cfg"
 CONFIG_FILE_TEMPLATE="$WDIR/${CONFIG_FILE_NAME}.example"
 
-step_config() {
+seq_config() {
   initSeqConfig "$CONFIG_FILE_NAME" "$CONFIG_FILE_TEMPLATE"
   if [ $? -eq 0 ] ; then
     CONFIG=1
-    echoseq "     Install: $LNMS_DIR"
-    echoseq "      Backup: $LNMS_BU_DIR"
+    info "     Install: $LNMS_DIR"
+    info "      Backup: $LNMS_BU_DIR"
   else
-    [ $DRY -eq 0 ] && return 1
+    dry || return 1
   fi
 }
 
 step_1_info() { echo "Updating apt"; }
-step_1_alias() { ALIAS="install"; }
+step_1_alias() { echo "install"; }
 step_1() {
   exe apt update
 }
@@ -94,7 +94,7 @@ step_10() {
 
 step_11_info() { echo "MariaDB configuration"; }
 step_11() {
-  outColor green
+  color green
   cat << SQLCONF_END
 
 Edit or create /etc/mysql/mariadb.conf.d/90-myconfig.cnf and add:
@@ -112,7 +112,7 @@ SQLCONF_END
 
 step_12_info() { echo "PHP fpm/cli timezone configuration"; }
 step_12() {
-  outColor green
+  color green
   cat << PHPCONF_END
 
 Ensure date.timezone is set in php.ini to your preferred time zone. See http://php.net/manual/en/timezones.php for a list of supported timezones. Valid examples are: "America/New_York", "Europe/Berlin", "Etc/UTC".
@@ -131,7 +131,7 @@ PHPCONF_END
 
 step_13_info() { echo "PHP fpm configuration"; }
 step_13() {
-  outColor green
+  color green
   cat << FPMCONF_END
 
 cp /etc/php/7.3/fpm/pool.d/www.conf /etc/php/7.3/fpm/pool.d/librenms.conf
@@ -154,7 +154,7 @@ FPMCONF_END
 
 step_14_info() { echo "Nginx configuration"; }
 step_14() {
-  outColor green
+  color green
   cat << NGINXCONF_END
 
 server {
@@ -182,15 +182,15 @@ NGINXCONF_END
 }
 
 step_20_info() { echo "Create $toolName cron job"; }
-step_20_alias() { ALIAS="cron"; }
+step_20_alias() { echo "cron"; }
 step_20() {
-  echoseq -n " [I] Creating $lnmsCronLoc ... "
-  exe cp "${LNMS_DIR}/librenms.nonroot.cron" "$lnmsCronLoc" && echoseq "Ok" || echoseq "Nok"
+  info -n " [I] Creating $lnmsCronLoc ... "
+  exe cp "${LNMS_DIR}/librenms.nonroot.cron" "$lnmsCronLoc" && info "Ok" || info "Nok"
 }
 lnmsCronLoc="/etc/cron.d/librenms"
 
 step_22_info() { echo "Enable lnms command completion"; }
-step_22_alias() { ALIAS="cmdcompletion"; }
+step_22_alias() { echo "cmdcompletion"; }
 step_22() {
   exep 'echo -e "#!/bin/bash\nsudo -u '$toolUser' \"'$LNMS_DIR'/lnms\" \"\$@\"" > '"$lnmsLocalBin"
   exe chmod 744 "$lnmsLocalBin"
@@ -199,44 +199,44 @@ step_22() {
 lnmsLocalBin="/usr/local/bin/lnms"
 
 step_24_info() { echo "Copy logrotate config"; }
-step_24_alias() { ALIAS="logrotate"; }
+step_24_alias() { echo "logrotate"; }
 step_24() {
-  echoseq -n " [I] Creating $lnmsLogrotLoc ... "
-  exe cp "${LNMS_DIR}/misc/librenms.logrotate" "$lnmsLogrotLoc" && echoseq "Ok" || echoseq "Nok"
+  info -n " [I] Creating $lnmsLogrotLoc ... "
+  exe cp "${LNMS_DIR}/misc/librenms.logrotate" "$lnmsLogrotLoc" && info "Ok" || info "Nok"
 }
 lnmsLogrotLoc="/etc/logrotate.d/librenms"
 
 step_26_info() { echo "Install nagios plugin to enable services"; }
-step_26_alias() { ALIAS="services"; }
+step_26_alias() { echo "services"; }
 step_26() {
   exe apt install monitoring-plugins
-  echoseq
-  echoseq " [$LNMS_DIR/config.php]"
-  echoseq "\$config['show_services']           = 1;"
-  echoseq
-  echoseq " [/etc/cron.d/librenms]"
-  echoseq "  */5 * * * * librenms /opt/librenms/services-wrapper.py 1"
+  info
+  info " [$LNMS_DIR/config.php]"
+  info "\$config['show_services']           = 1;"
+  info
+  info " [/etc/cron.d/librenms]"
+  info "  */5 * * * * librenms /opt/librenms/services-wrapper.py 1"
 }
 
 step_30_info() { echo "Backup ${toolName} web direcotry"; }
-step_30_alias() { ALIAS="backup"; }
+step_30_alias() { echo "backup"; }
 step_30() {
-  echoseq " [I] Backup install directory to ${LNMS_BU_DIR}"
+  info "Backup install directory to ${LNMS_BU_DIR}"
   exe mkdir -p "$LNMS_BU_DIR"
   exep "cd \"${LNMS_DIR}\"/.. && tar czf \"${LNMS_BU_DIR}/\`date +%Y%m%d\`_${toolName}_web.tar.gz\" \"$(basename "$LNMS_DIR")\""
 }
 
 step_31_info() { echo "Backup ${toolName} database [daily|monthly(default)]"; }
-step_31_alias() { ALIAS="backupdb"; }
+step_31_alias() { echo "backupdb"; }
 step_31() {
   case "$2" in
     daily|Daily|DAILY)
-      echoseq " [I] Daily backup..."
+      info "Daily backup..."
       exep "mysqldump --single-transaction -u root ${LNMS_DB_NAME} | bzip2 -c > \"${LNMS_BU_DIR}/${toolName}_daily.sql.bz2\""
       ;;
     *)
       exe mkdir -p "$LNMS_BU_DIR/monthly"
-      echoseq " [I] Monthly backup..."
+      info "Monthly backup..."
       exep "mysqldump --single-transaction -u root ${LNMS_DB_NAME} | bzip2 -c > \"${LNMS_BU_DIR}/monthly/\`date +%Y%m%d\`_${toolName}.sql.bz2\""
       ;;
   esac
@@ -258,7 +258,7 @@ STABLE_EOF
 }
 
 step_42_info() { echo "Fix librenms permission"; }
-step_42_alias() { ALIAS="fix"; }
+step_42_alias() { echo "fix"; }
 step_42() {
   exe chown -R ${toolUser}: "$LNMS_DIR"
   exe chmod 771 "${LNMS_DIR}"
@@ -275,5 +275,5 @@ fetchPhpVersion() {
 }
 
 # Sequence Revision
-VERSION_SEQREV=12
+readonly sqr_minVersion=16
 . /usr/local/bin/sequencer.sh