Fix wo stack migrate --nginx with wildcard certificate

This commit is contained in:
VirtuBox
2024-06-11 21:15:25 +02:00
parent 48e076c7ba
commit 007da6cd45
5 changed files with 16 additions and 7 deletions

View File

@@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## Releases ## Releases
### v3.21.0 - [Unreleased] ### v3.22.0 - [Unreleased]
### v3.21.1 - 2024-06-11
#### Fixed
- `wo stack migrate --nginx` when using wildcard certificate
### v3.21.0 - 2024-06-10
#### Added #### Added

View File

@@ -9,7 +9,7 @@
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# wget -qO wo wops.cc && sudo -E bash wo # wget -qO wo wops.cc && sudo -E bash wo
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# Version 3.21.0 - 2024-06-10 # Version 3.21.1 - 2024-06-11
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# CONTENTS # CONTENTS
@@ -932,9 +932,9 @@ else
wo_lib_echo "WordOps (wo) upgrade to $wo_version_new was successful!" wo_lib_echo "WordOps (wo) upgrade to $wo_version_new was successful!"
wo_lib_echo "Changelog is available on https://github.com/WordOps/WordOps/releases/tag/$wo_version_new" wo_lib_echo "Changelog is available on https://github.com/WordOps/WordOps/releases/tag/$wo_version_new"
echo echo
if [ "$wo_version_new" == "v3.21.0" ]; then if "v3.21" in "$wo_version_new"; then
wo_lib_echo "To upgrade Nginx package and configuration for HTTP/3 QUIC, use the following command" wo_lib_echo "To upgrade Nginx package and configuration for HTTP/3 QUIC, use the following command"
wo_lib_echo "wo stack migrate --nginx" wo_lib_echo_info "wo stack migrate --nginx"
fi fi
echo echo
wo_lib_echo "To upgrade WordOps web stacks, you can use the command:" wo_lib_echo "To upgrade WordOps web stacks, you can use the command:"

View File

@@ -27,7 +27,7 @@ if os.geteuid() == 0:
os.makedirs('/var/lib/wo/tmp/') os.makedirs('/var/lib/wo/tmp/')
setup(name='wordops', setup(name='wordops',
version='3.21.0', version='3.21.1',
description='An essential toolset that eases server administration', description='An essential toolset that eases server administration',
long_description=LONG, long_description=LONG,
long_description_content_type='text/markdown', long_description_content_type='text/markdown',

View File

@@ -118,7 +118,8 @@ class WOStackMigrateController(CementBaseController):
for site in allsites: for site in allsites:
if not site: if not site:
pass pass
if os.path.exists(f'/var/www/{site.sitename}/conf/nginx/ssl.conf'): if (os.path.exists(f'/var/www/{site.sitename}/conf/nginx/ssl.conf') and
not os.path.islink(f'/var/www/{site.sitename}/conf/nginx/ssl.conf')):
data = dict(ssl_live_path=WOVar.wo_ssl_live, data = dict(ssl_live_path=WOVar.wo_ssl_live,
domain=site.sitename, quic=True) domain=site.sitename, quic=True)
WOTemplate.deploy( WOTemplate.deploy(

View File

@@ -15,7 +15,7 @@ class WOVar():
"""Intialization of core variables""" """Intialization of core variables"""
# WordOps version # WordOps version
wo_version = "3.21.0" wo_version = "3.21.1"
# WordOps packages versions # WordOps packages versions
wo_adminer = "4.8.1" wo_adminer = "4.8.1"
wo_phpmyadmin = "5.2.0" wo_phpmyadmin = "5.2.0"