diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e5e3ad..4f79ca5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - `wo stack purge --all` failure if mysql isn't installed - Fix EEv3 files cleanup - Incorrect variable usage in `wo secure --port` +- Fix backup_ee function in install script ### v3.9.8.12 - 2019-09-20 diff --git a/install b/install index 3e13ba4..a380e30 100755 --- a/install +++ b/install @@ -624,17 +624,11 @@ wo_update_latest() { } wo_backup_ee() { - if [ -d /etc/nginx ]; then - local EE_NGINX="/etc/nginx" - else - local EE_NGINX="" - fi - if [ -d /etc/letsencrypt ]; then - local EE_LE="/etc/letsencrypt" - else - local EE_LE="" - fi - /bin/tar -I pigz -cf "$EE_BACKUP_FILE" "$EE_NGINX" /usr/local/bin/ee /usr/lib/ee/templates /usr/local/lib/python3.*/dist-packages/ee-*.egg /etc/ee /var/lib/ee "$EE_LE" + local BACKUP_EE="" + [ -d /etc/nginx ] && { BACKUP_EE="$BACKUP_EE /etc/nginx"; } + [ -d /etc/letsencrypt ] && { BACKUP_EE="$BACKUP_EE /etc/letsencrypt"; } + /bin/tar -I pigz -cf "$EE_BACKUP_FILE" /usr/local/bin/ee /usr/lib/ee/templates /usr/local/lib/python3.*/dist-packages/ee-*.egg /etc/ee /var/lib/ee "$BACKUP_EE" + return 0 } wo_backup_wo() { diff --git a/wo/cli/plugins/secure.py b/wo/cli/plugins/secure.py index a0ac649..31e176b 100644 --- a/wo/cli/plugins/secure.py +++ b/wo/cli/plugins/secure.py @@ -101,7 +101,7 @@ class WOSecureController(CementBaseController): pargs = self.app.pargs if pargs.user_input: while ((not pargs.user_input.isdigit()) and - (not pargs.user_input < 65556)): + (not pargs.user_input < 65536)): Log.info(self, "Please enter a valid port number ") pargs.user_input = input("WordOps " "admin port [22222]:") @@ -109,7 +109,7 @@ class WOSecureController(CementBaseController): port = input("WordOps admin port [22222]:") if port == "": port = 22222 - while (not port.isdigit()) and (port != "") and (not port < 65556): + while (not port.isdigit()) and (port != "") and (not port < 65536): Log.info(self, "Please Enter valid port number :") port = input("WordOps admin port [22222]:") pargs.user_input = port @@ -196,7 +196,7 @@ class WOSecureController(CementBaseController): pargs = self.app.pargs if pargs.user_input: while ((not pargs.user_input.isdigit()) and - (not pargs.user_input < 65556)): + (not pargs.user_input < 65536)): Log.info(self, "Please enter a valid port number ") pargs.user_input = input("Server " "SSH port [22]:") @@ -204,7 +204,7 @@ class WOSecureController(CementBaseController): port = input("Server SSH port [22]:") if port == "": port = 22 - while (not port.isdigit()) and (port != "") and (not port < 65556): + while (not port.isdigit()) and (port != "") and (not port < 65536): Log.info(self, "Please Enter valid port number :") port = input("Server SSH port [22]:") pargs.user_input = port