From d9023a5db2ec66727549fdf9aab9744fa409c9d5 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 15 Aug 2023 17:14:48 +0200 Subject: [PATCH 1/5] Fix wo site update alias --- wo/cli/plugins/site_update.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index 43b1cce..c572c25 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -268,7 +268,8 @@ class WOSiteUpdateController(CementBaseController): (stype == oldsitetype and cache == oldcachetype)) and not (pargs.php72 or pargs.php73 or pargs.php74 or pargs.php80 or - pargs.php81 or pargs.php82)): + pargs.php81 or pargs.php82 or + pargs.alias)): Log.info(self, Log.FAIL + "can not update {0} {1} to {2} {3}". format(oldsitetype, oldcachetype, stype, cache)) return 1 @@ -532,6 +533,13 @@ class WOSiteUpdateController(CementBaseController): " http://{0}".format(wo_domain)) return 0 + if 'alias' in data.keys() and data['alias_name']: + updateSiteInfo(self, wo_domain, stype=stype, cache=cache, + ssl=(bool(check_site.is_ssl))) + Log.info(self, "Successfully updated site" + " http://{0}".format(wo_domain)) + return 0 + if pargs.letsencrypt: if data['letsencrypt'] is True: # DNS API configuration From a555ec2ff391099983ee1aee965d5be300c50416 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 15 Aug 2023 18:00:10 +0200 Subject: [PATCH 2/5] Fix wo site update alias --- wo/cli/plugins/site_update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index c572c25..1627dbb 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -336,7 +336,7 @@ class WOSiteUpdateController(CementBaseController): webroot=wo_site_webroot) stype = oldsitetype cache = oldcachetype - if oldsitetype == 'html' or oldsitetype == 'proxy': + if oldsitetype == 'html' or oldsitetype == 'proxy' or oldsitetype == 'alias': data['static'] = False data['wp'] = False data['multisite'] = False From f1db29c81a582dce453b98bf5e503a7b19898eb3 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 15 Aug 2023 18:27:27 +0200 Subject: [PATCH 3/5] Fix wo site update alias --- wo/cli/plugins/site_update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index 1627dbb..a99cfdc 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -533,7 +533,7 @@ class WOSiteUpdateController(CementBaseController): " http://{0}".format(wo_domain)) return 0 - if 'alias' in data.keys() and data['alias_name']: + if 'alias_name' in data.keys() and data['alias']: updateSiteInfo(self, wo_domain, stype=stype, cache=cache, ssl=(bool(check_site.is_ssl))) Log.info(self, "Successfully updated site" From b9958c82936c49d8328f0d4dc6be41755d613983 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 15 Aug 2023 18:38:38 +0200 Subject: [PATCH 4/5] Fix wo site update alias --- wo/cli/plugins/site_update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index a99cfdc..7b3a1a0 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -474,7 +474,8 @@ class WOSiteUpdateController(CementBaseController): # Vérification si rien n'a changé if all(globals()[version_key] is bool(check_php_version == version) for version_key, - version in WOVar.wo_php_versions.items()) and (stype == oldsitetype and cache == oldcachetype): + version in WOVar.wo_php_versions.items()) and (stype == oldsitetype + and cache == oldcachetype and stype != 'alias'): Log.debug(self, "Nothing to update") return 1 From 7da989276f8d46dbfdb60b6f24f2dc29ac357e00 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 15 Aug 2023 18:43:11 +0200 Subject: [PATCH 5/5] Fix wo site update proxy --- wo/cli/plugins/site_update.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index 7b3a1a0..a9df73a 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -475,7 +475,9 @@ class WOSiteUpdateController(CementBaseController): # Vérification si rien n'a changé if all(globals()[version_key] is bool(check_php_version == version) for version_key, version in WOVar.wo_php_versions.items()) and (stype == oldsitetype - and cache == oldcachetype and stype != 'alias'): + and cache == oldcachetype + and stype != 'alias' + and stype != 'proxy'): Log.debug(self, "Nothing to update") return 1