From 007da6cd45323c4dd643cda13b4afdab7199dbf2 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Tue, 11 Jun 2024 21:15:25 +0200
Subject: [PATCH] Fix wo stack migrate --nginx with wildcard certificate

---
 CHANGELOG.md                    | 10 +++++++++-
 install                         |  6 +++---
 setup.py                        |  2 +-
 wo/cli/plugins/stack_migrate.py |  3 ++-
 wo/core/variables.py            |  2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52863bf..b145e2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## 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
 
diff --git a/install b/install
index bc756ad..a5860c7 100755
--- a/install
+++ b/install
@@ -9,7 +9,7 @@
 # -------------------------------------------------------------------------
 # wget -qO wo wops.cc && sudo -E bash wo
 # -------------------------------------------------------------------------
-# Version 3.21.0 - 2024-06-10
+# Version 3.21.1 - 2024-06-11
 # -------------------------------------------------------------------------
 
 # CONTENTS
@@ -932,9 +932,9 @@ else
         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"
         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 "wo stack migrate --nginx"
+            wo_lib_echo_info "wo stack migrate --nginx"
         fi
         echo
         wo_lib_echo "To upgrade WordOps web stacks, you can use the command:"
diff --git a/setup.py b/setup.py
index 364991a..e5543af 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ if os.geteuid() == 0:
         os.makedirs('/var/lib/wo/tmp/')
 
 setup(name='wordops',
-      version='3.21.0',
+      version='3.21.1',
       description='An essential toolset that eases server administration',
       long_description=LONG,
       long_description_content_type='text/markdown',
diff --git a/wo/cli/plugins/stack_migrate.py b/wo/cli/plugins/stack_migrate.py
index 5771b17..91b32fe 100644
--- a/wo/cli/plugins/stack_migrate.py
+++ b/wo/cli/plugins/stack_migrate.py
@@ -118,7 +118,8 @@ class WOStackMigrateController(CementBaseController):
         for site in allsites:
             if not site:
                 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,
                             domain=site.sitename, quic=True)
                 WOTemplate.deploy(
diff --git a/wo/core/variables.py b/wo/core/variables.py
index ea2348e..7c7e86a 100644
--- a/wo/core/variables.py
+++ b/wo/core/variables.py
@@ -15,7 +15,7 @@ class WOVar():
     """Intialization of core variables"""
 
     # WordOps version
-    wo_version = "3.21.0"
+    wo_version = "3.21.1"
     # WordOps packages versions
     wo_adminer = "4.8.1"
     wo_phpmyadmin = "5.2.0"