Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix EEv3 migration

Browse Source
This commit is contained in:
VirtuBox
2019-09-23 14:24:16 +02:00
parent 2a41abbce7
commit 65bab99dda
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -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 - `wo stack purge --all` failure if mysql isn't installed
- Fix EEv3 files cleanup - Fix EEv3 files cleanup
- Incorrect variable usage in `wo secure --port` - Incorrect variable usage in `wo secure --port`
- Fix backup_ee function in install script
### v3.9.8.12 - 2019-09-20 ### v3.9.8.12 - 2019-09-20

16
install
View File

@@ -624,17 +624,11 @@ wo_update_latest() {
} }
wo_backup_ee() { wo_backup_ee() {
if [ -d /etc/nginx ]; then local BACKUP_EE=""
local EE_NGINX="/etc/nginx" [ -d /etc/nginx ] && { BACKUP_EE="$BACKUP_EE /etc/nginx"; }
else [ -d /etc/letsencrypt ] && { BACKUP_EE="$BACKUP_EE /etc/letsencrypt"; }
local EE_NGINX="" /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"
fi return 0
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"
} }
wo_backup_wo() { wo_backup_wo() {

8
wo/cli/plugins/secure.py
View File

@@ -101,7 +101,7 @@ class WOSecureController(CementBaseController):
pargs = self.app.pargs pargs = self.app.pargs
if pargs.user_input: if pargs.user_input:
while ((not pargs.user_input.isdigit()) and 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 ") Log.info(self, "Please enter a valid port number ")
pargs.user_input = input("WordOps " pargs.user_input = input("WordOps "
"admin port [22222]:") "admin port [22222]:")
@@ -109,7 +109,7 @@ class WOSecureController(CementBaseController):
port = input("WordOps admin port [22222]:") port = input("WordOps admin port [22222]:")
if port == "": if port == "":
port = 22222 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 :") Log.info(self, "Please Enter valid port number :")
port = input("WordOps admin port [22222]:") port = input("WordOps admin port [22222]:")
pargs.user_input = port pargs.user_input = port
@@ -196,7 +196,7 @@ class WOSecureController(CementBaseController):
pargs = self.app.pargs pargs = self.app.pargs
if pargs.user_input: if pargs.user_input:
while ((not pargs.user_input.isdigit()) and 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 ") Log.info(self, "Please enter a valid port number ")
pargs.user_input = input("Server " pargs.user_input = input("Server "
"SSH port [22]:") "SSH port [22]:")
@@ -204,7 +204,7 @@ class WOSecureController(CementBaseController):
port = input("Server SSH port [22]:") port = input("Server SSH port [22]:")
if port == "": if port == "":
port = 22 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 :") Log.info(self, "Please Enter valid port number :")
port = input("Server SSH port [22]:") port = input("Server SSH port [22]:")
pargs.user_input = port pargs.user_input = port