Fix error in --letsencrypt=subdomain

This commit is contained in:
VirtuBox
2019-07-23 12:47:02 +02:00
parent 68596ac333
commit 68a299be83
2 changed files with 2 additions and 2 deletions

View File

@@ -684,7 +684,7 @@ if [ -x /usr/local/bin/wo ]; then
fi fi
if [ -z "$wo_preserve_config" ]; then if [ -z "$wo_preserve_config" ]; then
if [ -n "$(command -v nginx)" ]; then if [ -n "$(command -v nginx)" ]; then
if ! grep -q "v3.9.5." /etc/nginx/common/release; then if [ ! -f /etc/nginx/common/release ] || ! grep -q "v3.9.6" /etc/nginx/common/release; then
wo_lib_echo "Upgrading Nginx" | tee -ai $wo_install_log wo_lib_echo "Upgrading Nginx" | tee -ai $wo_install_log
wo_upgrade_nginx | tee -ai $wo_install_log wo_upgrade_nginx | tee -ai $wo_install_log
fi fi

View File

@@ -1369,7 +1369,7 @@ def setupLetsEncrypt(self, wo_domain_name, subdomain=False, wildcard=False,
"'/etc/letsencrypt/config' " "'/etc/letsencrypt/config' "
"--issue " "--issue "
"-d {0} {1}" "-d {0} {1}"
"-k {3} -f" "-k {2} -f"
.format(wo_domain_name, .format(wo_domain_name,
acme_mode, acme_mode,
keylenght)) keylenght))