Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'updating-configuration' of https://github.com/WordOps/WordOps into updating-configuration

Browse Source
This commit is contained in:
VirtuBox
2024-05-29 02:01:08 +02:00
parent def2ddd393 f533438f8d
commit 7411c3f387
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup.cfg
View File

@@ -15,7 +15,7 @@ where=tests/
license-file = LICENSE license-file = LICENSE
[flake8] [flake8]
ignore = F405,W504,S322,S404,S603,s607,s602,C901 ignore = F405,W504,S322,S404,S603,s607,s602,C901,W503
max-line-length = 120 max-line-length = 120
exclude = exclude =
# No need to traverse our git directory # No need to traverse our git directory
@@ -26,4 +26,4 @@ exclude =
build, build,
# This contains builds of flake8 that we don't want to check # This contains builds of flake8 that we don't want to check
dist dist
max-complexity = 10 max-complexity = 10

6
wo/cli/plugins/stack_pref.py
View File

@@ -5,7 +5,6 @@ import shutil
import string import string
import psutil import psutil
import requests
from wo.core.apt_repo import WORepo from wo.core.apt_repo import WORepo
from wo.core.aptget import WOAptGet from wo.core.aptget import WOAptGet
from wo.core.cron import WOCron from wo.core.cron import WOCron
@@ -419,7 +418,7 @@ def post_pref(self, apt_packages, packages, upgrade=False):
["HTTP Auth Password : {0}" ["HTTP Auth Password : {0}"
.format(passwd)]) .format(passwd)])
self.msg = (self.msg + [f'WordOps backend is available on https://{server_ip}:22222]) ' 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) data = dict(release=WOVar.wo_version)
WOTemplate.deploy(self, '/opt/cf-update.sh', WOTemplate.deploy(self, '/opt/cf-update.sh',
@@ -646,7 +645,8 @@ def post_pref(self, apt_packages, packages, upgrade=False):
.format(php_version[0])): .format(php_version[0])):
WOGit.rollback(self, ["/etc/php"], msg="Rollback PHP") WOGit.rollback(self, ["/etc/php"], msg="Rollback PHP")
else: 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") WOGit.add(self, ["/etc/php"], msg="Adding PHP into Git")
if os.path.exists('/etc/nginx/conf.d/upstream.conf'): if os.path.exists('/etc/nginx/conf.d/upstream.conf'):