hosting/ynh-apps_tools
1
0
Fork 0
Code Activity

packagingv2: also autocomment nginx reload lines which are superfluous

Browse source
This commit is contained in:
Alexandre Aubin 2022-12-04 03:47:09 +01:00
parent 581d227bd3
commit 4d6613b76d
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packaging_v2/convert_app_to_packaging_v2.py
View file

@ -272,6 +272,8 @@ def cleanup_scripts_and_conf(folder):
"^.*ynh_script_progression.*Validating.*parameters", "^.*ynh_script_progression.*Validating.*parameters",
"^.*ynh_script_progression.*SQL database", "^.*ynh_script_progression.*SQL database",
"^.*ynh_script_progression.*Configuring permissions", "^.*ynh_script_progression.*Configuring permissions",
"^.*ynh_script_progression.*Reloading NGINX web server",
"^.*ynh_systemd_action --service_name=nginx --action=reload",
] ]
patterns_to_remove_in_scripts = [re.compile(f"({p})", re.MULTILINE) for p in patterns_to_remove_in_scripts] patterns_to_remove_in_scripts = [re.compile(f"({p})", re.MULTILINE) for p in patterns_to_remove_in_scripts]
@ -294,6 +296,12 @@ def cleanup_scripts_and_conf(folder):
content = open(script).read() content = open(script).read()
for pattern in patterns_to_remove_in_scripts: for pattern in patterns_to_remove_in_scripts:
if "^.*ynh_script_progression.*Reloading NGINX web server" in pattern.pattern and s == "restore":
# This case is legit
continue
if "^.*ynh_systemd_action --service_name=nginx --action=reload" in pattern.pattern and s == "restore":
# This case is legit
continue
content = pattern.sub(r"#REMOVEME? \1", content) content = pattern.sub(r"#REMOVEME? \1", content)
for pattern, replace in replaces: for pattern, replace in replaces: