From 96bad01d41444a8f4f1b7b61061a6480775c8c0a Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Sun, 3 Sep 2023 23:26:24 +0200 Subject: [PATCH 01/10] Fix requirement and update bash_completion --- config/bash_completion.d/wo_auto.rc | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/bash_completion.d/wo_auto.rc b/config/bash_completion.d/wo_auto.rc index 082d0d1..d24738e 100644 --- a/config/bash_completion.d/wo_auto.rc +++ b/config/bash_completion.d/wo_auto.rc @@ -159,13 +159,13 @@ _wo_complete() "create") COMPREPLY=( $(compgen \ - -W "--user --pass --email --html --php --php72 --php73 --php74 --php80 --php81 --php82 --mysql --wp --wpsubdir --wpsubdomain --wpfc --wpsc --proxy= --wpredis --wprocket --wpce -le --letsencrypt --letsencrypt=wildcard -le=wildcard --dns --dns=dns_cf --dns=dns_dgon" \ + -W "--user --pass --email --html --php --php72 --php73 --php74 --php80 --php81 --php82 --mysql --wp --wpsubdir --wpsubdomain --wpfc --wpsc --proxy= --alias --wpredis --wprocket --wpce -le --letsencrypt --letsencrypt=wildcard -le=wildcard --dns --dns=dns_cf --dns=dns_dgon" \ -- $cur) ) ;; "update") COMPREPLY=( $(compgen \ - -W "--password --php --php72 --php73 --php74 --php80 --php81 --php82 --mysql --wp --wpsubdir --wpsubdomain --wpfc --wpsc --wpredis --wprocket --wpce -le -le=off --letsencrypt --letsencrypt=off --letsencrypt=clean -le=wildcard -le=clean --dns --dns=dns_cf --dns=dns_dgon --ngxblocker --ngxblocker=off" \ + -W "--password --php --php72 --php73 --php74 --php80 --php81 --php82 --mysql --wp --wpsubdir --wpsubdomain --wpfc --wpsc --wpredis --wprocket --wpce --alias -le -le=off --letsencrypt --letsencrypt=off --letsencrypt=clean -le=wildcard -le=clean --dns --dns=dns_cf --dns=dns_dgon --ngxblocker --ngxblocker=off" \ -- $cur) ) ;; "delete") diff --git a/setup.py b/setup.py index 1b64bd4..4afb1f7 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ setup(name='wordops', 'cement == 2.10.12', 'pystache', 'pynginxconfig', - 'PyMySQL == 1.1.0', + 'PyMySQL >= 1.0.2', 'psutil', 'sh', 'SQLAlchemy == 1.4.49', From d24026077fe62c735c93903bf4a34d5eae84d2dd Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 14 Sep 2023 19:43:20 +0200 Subject: [PATCH 02/10] Auto stash before merge of "updating-configuration" and "origin/updating-configuration" --- wo/cli/plugins/site_update.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index a9df73a..9b3bb6e 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -389,12 +389,14 @@ class WOSiteUpdateController(CementBaseController): if getattr(pargs, pargs_version): if globals()[pargs_version] is old_version_var: - Log.info(self, f"PHP {version} is already enabled for given site") + Log.info( + self, f"PHP {version} is already enabled for given site") setattr(pargs, pargs_version, False) if (data and not getattr(pargs, pargs_version)): data[pargs_version] = bool(old_version_var is True) - Log.debug(self, f"data {pargs_version} = {data[pargs_version]}") + Log.debug( + self, f"data {pargs_version} = {data[pargs_version]}") globals()[pargs_version] = bool(old_version_var is True) if pargs.letsencrypt: @@ -485,7 +487,9 @@ class WOSiteUpdateController(CementBaseController): for pargs_version, version in WOVar.wo_php_versions.items(): if globals()[pargs_version] is True: data['wo_php'] = pargs_version + Log.debug(self, f"data wo_php set to {pargs_version}") check_php_version = version + Log.debug(self, f"check_php_versions et to {version}") break if pargs.hsts: From 42b349ab13a1b36ac2d39a1e6c6492c6e96170f3 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 14 Sep 2023 19:54:56 +0200 Subject: [PATCH 03/10] Fix wo site update --- wo/cli/plugins/site_update.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index 9b3bb6e..a06f046 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -393,7 +393,7 @@ class WOSiteUpdateController(CementBaseController): self, f"PHP {version} is already enabled for given site") setattr(pargs, pargs_version, False) - if (data and not getattr(pargs, pargs_version)): + if (data and not getattr(pargs, pargs_version, True)): data[pargs_version] = bool(old_version_var is True) Log.debug( self, f"data {pargs_version} = {data[pargs_version]}") @@ -796,7 +796,7 @@ class WOSiteUpdateController(CementBaseController): # Setup WordPress if old sites are html/php/mysql sites if data['wp'] and oldsitetype in ['html', 'proxy', 'php', 'php72', 'mysql', 'php73', 'php74', 'php80', - 'php81', ]: + 'php81', 'php82']: try: wo_wp_creds = setupwordpress(self, data) except SiteError as e: From 22d1f9cb6885728e60998ab913ad7c1dca240535 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 14 Sep 2023 21:15:56 +0200 Subject: [PATCH 04/10] fix wo site update --- 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 a06f046..172de9f 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -393,7 +393,7 @@ class WOSiteUpdateController(CementBaseController): self, f"PHP {version} is already enabled for given site") setattr(pargs, pargs_version, False) - if (data and not getattr(pargs, pargs_version, True)): + if (data and getattr(pargs, pargs_version, False)): data[pargs_version] = bool(old_version_var is True) Log.debug( self, f"data {pargs_version} = {data[pargs_version]}") From 49fbab4424ef57a553392748416aac443fb2ac20 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 14 Sep 2023 21:48:46 +0200 Subject: [PATCH 05/10] Fix wo site update --- wo/cli/plugins/site_update.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index 172de9f..3ca078c 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -377,13 +377,6 @@ class WOSiteUpdateController(CementBaseController): if oldcachetype in data: data[oldcachetype] = True - for pargs_version in WOVar.wo_php_versions: - if getattr(pargs, pargs_version): - Log.debug(self, f"pargs.{pargs_version} detected") - data[pargs_version] = True - globals()[pargs_version] = True - break - for pargs_version, version in WOVar.wo_php_versions.items(): old_version_var = bool(check_php_version == version) @@ -392,8 +385,12 @@ class WOSiteUpdateController(CementBaseController): Log.info( self, f"PHP {version} is already enabled for given site") setattr(pargs, pargs_version, False) + Log.debug(self, f"pargs.{pargs_version} detected") + data[pargs_version] = True + globals()[pargs_version] = True + break - if (data and getattr(pargs, pargs_version, False)): + elif (data and getattr(pargs, pargs_version)): data[pargs_version] = bool(old_version_var is True) Log.debug( self, f"data {pargs_version} = {data[pargs_version]}") From ec7ab751ce59691a15ebe08a5bf81a209b54a9cb Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 14 Sep 2023 22:33:24 +0200 Subject: [PATCH 06/10] Fix wo site update --- 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 3ca078c..662cfe8 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -390,7 +390,7 @@ class WOSiteUpdateController(CementBaseController): globals()[pargs_version] = True break - elif (data and getattr(pargs, pargs_version)): + elif (data and not getattr(pargs, pargs_version)): data[pargs_version] = bool(old_version_var is True) Log.debug( self, f"data {pargs_version} = {data[pargs_version]}") From 867f0b4a659856f54415937f50d96c50fed079a2 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 14 Sep 2023 23:35:25 +0200 Subject: [PATCH 07/10] Fix wo site update --- wo/cli/plugins/site_update.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index 662cfe8..8eb0565 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -377,6 +377,13 @@ class WOSiteUpdateController(CementBaseController): if oldcachetype in data: data[oldcachetype] = True + for pargs_version in WOVar.wo_php_versions: + if getattr(pargs, pargs_version): + Log.debug(self, f"pargs.{pargs_version} detected") + data[pargs_version] = True + globals()[pargs_version] = True + break + for pargs_version, version in WOVar.wo_php_versions.items(): old_version_var = bool(check_php_version == version) @@ -385,12 +392,8 @@ class WOSiteUpdateController(CementBaseController): Log.info( self, f"PHP {version} is already enabled for given site") setattr(pargs, pargs_version, False) - Log.debug(self, f"pargs.{pargs_version} detected") - data[pargs_version] = True - globals()[pargs_version] = True - break - elif (data and not getattr(pargs, pargs_version)): + elif data: data[pargs_version] = bool(old_version_var is True) Log.debug( self, f"data {pargs_version} = {data[pargs_version]}") From d941cdc8795292cf0edba561681bf953f193341a Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 14 Sep 2023 23:40:21 +0200 Subject: [PATCH 08/10] Fix wo site update --- wo/cli/plugins/site_update.py | 1 + 1 file changed, 1 insertion(+) diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index 8eb0565..4d53110 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -382,6 +382,7 @@ class WOSiteUpdateController(CementBaseController): Log.debug(self, f"pargs.{pargs_version} detected") data[pargs_version] = True globals()[pargs_version] = True + setattr(pargs, pargs_version) break for pargs_version, version in WOVar.wo_php_versions.items(): From 5690bec03a8e084d4ea73adc0a58f7c483e6cbf1 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 14 Sep 2023 23:49:17 +0200 Subject: [PATCH 09/10] Fix wo site update --- wo/cli/plugins/site_update.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index 4d53110..1ddb878 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -382,7 +382,7 @@ class WOSiteUpdateController(CementBaseController): Log.debug(self, f"pargs.{pargs_version} detected") data[pargs_version] = True globals()[pargs_version] = True - setattr(pargs, pargs_version) + setattr(pargs, pargs_version, True) break for pargs_version, version in WOVar.wo_php_versions.items(): @@ -394,7 +394,7 @@ class WOSiteUpdateController(CementBaseController): self, f"PHP {version} is already enabled for given site") setattr(pargs, pargs_version, False) - elif data: + else: data[pargs_version] = bool(old_version_var is True) Log.debug( self, f"data {pargs_version} = {data[pargs_version]}") From c5a10d5bb60976ed98dbf5af4c0ea0d46a9a3b0e Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 15 Sep 2023 00:10:02 +0200 Subject: [PATCH 10/10] Fix wo site update --- wo/cli/plugins/site_update.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index 1ddb878..7f4826b 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -382,11 +382,11 @@ class WOSiteUpdateController(CementBaseController): Log.debug(self, f"pargs.{pargs_version} detected") data[pargs_version] = True globals()[pargs_version] = True - setattr(pargs, pargs_version, True) break for pargs_version, version in WOVar.wo_php_versions.items(): old_version_var = bool(check_php_version == version) + Log.debug(self, f"old_version_var for {version} = {old_version_var}") if getattr(pargs, pargs_version): if globals()[pargs_version] is old_version_var: @@ -394,7 +394,9 @@ class WOSiteUpdateController(CementBaseController): self, f"PHP {version} is already enabled for given site") setattr(pargs, pargs_version, False) - else: + if (data and (not pargs.php73) and + (not pargs.php74) and (not pargs.php72) and + (not pargs.php80) and (not pargs.php81) and (not pargs.php82)): data[pargs_version] = bool(old_version_var is True) Log.debug( self, f"data {pargs_version} = {data[pargs_version]}")