packagingv2: deprecate the nginx reload at the end of scripts ... there just no need for it :|

This commit is contained in:
Alexandre Aubin 2022-12-04 03:30:45 +01:00
parent 2ad2188805
commit b0cde49675

View file

@ -2493,7 +2493,7 @@ class Script(TestSuite):
) )
@test() @test()
def ssowatconf(self): def ssowatconf_or_nginx_reload(self):
# Dirty hack to check only the 10 last lines for ssowatconf # Dirty hack to check only the 10 last lines for ssowatconf
# (the "bad" practice being using this at the very end of the script, but some apps legitimately need this in the middle of the script) # (the "bad" practice being using this at the very end of the script, but some apps legitimately need this in the middle of the script)
oldlines = list(self.lines) oldlines = list(self.lines)
@ -2502,6 +2502,13 @@ class Script(TestSuite):
yield Warning( yield Warning(
"You probably don't need to run 'yunohost app ssowatconf' in the app self. It's supposed to be ran automatically after the script." "You probably don't need to run 'yunohost app ssowatconf' in the app self. It's supposed to be ran automatically after the script."
) )
if app_packaging_format >= 2 and self.name not in ["change_url", "restore"]:
if self.contains("ynh_systemd_action --service_name=nginx --action=reload"):
yield Warning(
"You should not need to reload nginx at the end of the script ... it's already taken care of by ynh_add_nginx_config"
)
self.lines = oldlines self.lines = oldlines
@test() @test()