From 00b3f99e5d9f372071d95764225eef5057e8c3c2 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 11 Jun 2024 23:18:27 +0200 Subject: [PATCH] Another fix for wildcard certificates --- wo/cli/plugins/stack_migrate.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/wo/cli/plugins/stack_migrate.py b/wo/cli/plugins/stack_migrate.py index 91b32fe..355b3dd 100644 --- a/wo/cli/plugins/stack_migrate.py +++ b/wo/cli/plugins/stack_migrate.py @@ -11,6 +11,7 @@ from wo.core.shellexec import WOShellExec from wo.core.variables import WOVar from wo.cli.plugins.sitedb import (getAllsites) from wo.core.template import WOTemplate +from wo.core.domainvalidate import WODomain class WOStackMigrateController(CementBaseController): @@ -118,13 +119,23 @@ class WOStackMigrateController(CementBaseController): for site in allsites: if not site: pass - 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( - self, f'/var/www/{site.sitename}/conf/nginx/ssl.conf', - 'ssl.mustache', data, overwrite=True) + if os.path.exists(f'/var/www/{site.sitename}/conf/nginx/ssl.conf'): + if 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( + self, f'/var/www/{site.sitename}/conf/nginx/ssl.conf', + 'ssl.mustache', data, overwrite=True) + else: + (wo_domain_type, wo_root_domain) = WODomain.getlevel( + self, site.sitename) + if (site.sitename != wo_root_domain and + os.path.exists(f'/etc/letsencrypt/shared/{wo_root_domain}.conf')): + data = dict(ssl_live_path=WOVar.wo_ssl_live, + domain=wo_root_domain, quic=True) + WOTemplate.deploy( + self, f'/etc/letsencrypt/shared/{wo_root_domain}.conf', + 'ssl.mustache', data, overwrite=True) post_pref(self, WOVar.wo_nginx, []) @expose(hide=True)