From ae41db1111b0c48ee2857038b5df1d9b0a29371c Mon Sep 17 00:00:00 2001 From: Thomas SUCHON Date: Thu, 23 May 2024 15:30:05 +0200 Subject: [PATCH 1/2] Fix backend address display in Nginx install --- wo/cli/plugins/stack_pref.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 9199307..b56bda1 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -419,7 +419,7 @@ def post_pref(self, apt_packages, packages, upgrade=False): ["HTTP Auth Password : {0}" .format(passwd)]) self.msg = (self.msg + [f'WordOps backend is available on https://{server_ip}:22222]) ' - 'or https://{WOVar.wo_fqdn}:22222']) + f'or https://{WOVar.wo_fqdn}:22222']) data = dict(release=WOVar.wo_version) WOTemplate.deploy(self, '/opt/cf-update.sh', @@ -646,7 +646,8 @@ def post_pref(self, apt_packages, packages, upgrade=False): .format(php_version[0])): WOGit.rollback(self, ["/etc/php"], msg="Rollback PHP") else: - Log.valide(self, "Configuring php{0}-fpm".format(php_version[0])) + Log.valide( + self, "Configuring php{0}-fpm".format(php_version[0])) WOGit.add(self, ["/etc/php"], msg="Adding PHP into Git") if os.path.exists('/etc/nginx/conf.d/upstream.conf'): From f533438f8d0bd53b2d9162d26c08532667a4a022 Mon Sep 17 00:00:00 2001 From: Thomas SUCHON Date: Thu, 23 May 2024 16:09:37 +0200 Subject: [PATCH 2/2] Cleanup unused library --- setup.cfg | 4 ++-- wo/cli/plugins/stack_pref.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 7d616e1..d71d161 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,7 +15,7 @@ where=tests/ license-file = LICENSE [flake8] -ignore = F405,W504,S322,S404,S603,s607,s602,C901 +ignore = F405,W504,S322,S404,S603,s607,s602,C901,W503 max-line-length = 120 exclude = # No need to traverse our git directory @@ -26,4 +26,4 @@ exclude = build, # This contains builds of flake8 that we don't want to check dist -max-complexity = 10 \ No newline at end of file +max-complexity = 10 diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index b56bda1..1239a73 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -5,7 +5,6 @@ import shutil import string import psutil -import requests from wo.core.apt_repo import WORepo from wo.core.aptget import WOAptGet from wo.core.cron import WOCron