YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1601 from YunoHost/ci-format-debian/11.1.9

Browse source 
[CI] Format code with Black
This commit is contained in:
Alexandre Aubin 2023-02-20 20:51:07 +01:00 • committed by GitHub
commit c300e023ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/app.py
View file

@ -446,9 +446,7 @@ def app_change_url(operation_logger, app, domain, path):
{"domain": domain, "path": path}, path_requirement, ignore_app=app {"domain": domain, "path": path}, path_requirement, ignore_app=app
) )
if path_requirement == "full_domain" and path != "/": if path_requirement == "full_domain" and path != "/":
raise YunohostValidationError( raise YunohostValidationError("app_change_url_require_full_domain", app=app)
"app_change_url_require_full_domain", app=app
)
tmp_workdir_for_app = _make_tmp_workdir_for_app(app=app) tmp_workdir_for_app = _make_tmp_workdir_for_app(app=app)
@ -478,7 +476,9 @@ def app_change_url(operation_logger, app, domain, path):
new_nginx_conf_path = f"/etc/nginx/conf.d/{domain}.d/{app}.conf" new_nginx_conf_path = f"/etc/nginx/conf.d/{domain}.d/{app}.conf"
old_nginx_conf_backup = None old_nginx_conf_backup = None
if not os.path.exists(old_nginx_conf_path): if not os.path.exists(old_nginx_conf_path):
logger.warning(f"Current nginx config file {old_nginx_conf_path} doesn't seem to exist ... wtf ?") logger.warning(
f"Current nginx config file {old_nginx_conf_path} doesn't seem to exist ... wtf ?"
)
else: else:
old_nginx_conf_backup = read_file(old_nginx_conf_path) old_nginx_conf_backup = read_file(old_nginx_conf_path)
@ -500,15 +500,17 @@ def app_change_url(operation_logger, app, domain, path):
), ),
) )
finally: finally:
shutil.rmtree(tmp_workdir_for_app) shutil.rmtree(tmp_workdir_for_app)
if change_url_failed: if change_url_failed:
logger.warning("Restoring initial nginx config file") logger.warning("Restoring initial nginx config file")
if old_nginx_conf_path != new_nginx_conf_path and os.path.exists(new_nginx_conf_path): if old_nginx_conf_path != new_nginx_conf_path and os.path.exists(
new_nginx_conf_path
):
rm(new_nginx_conf_path, force=True) rm(new_nginx_conf_path, force=True)
write_to_file(old_nginx_conf_path, old_nginx_conf_backup) if old_nginx_conf_backup:
service_reload_or_restart("nginx") write_to_file(old_nginx_conf_path, old_nginx_conf_backup)
service_reload_or_restart("nginx")
# restore values modified by app_checkurl # restore values modified by app_checkurl
# see begining of the function # see begining of the function
@ -524,7 +526,9 @@ def app_change_url(operation_logger, app, domain, path):
service_reload_or_restart("nginx") service_reload_or_restart("nginx")
logger.success(m18n.n("app_change_url_success", app=app, domain=domain, path=path)) logger.success(
m18n.n("app_change_url_success", app=app, domain=domain, path=path)
)
hook_callback("post_app_change_url", env=env_dict) hook_callback("post_app_change_url", env=env_dict)