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

provision: reload the firewall only once

Browse source
This commit is contained in:
OniriCorpe 2024-05-20 23:58:50 +02:00
parent d5e054fe80
commit 832b9d3bce
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/utils/resources.py
View file

@ -1153,7 +1153,9 @@ class AptDependenciesAppResource(AppResource):
for key, values in self.extras.items(): for key, values in self.extras.items():
if isinstance(values.get("packages"), str): if isinstance(values.get("packages"), str):
values["packages"] = [value.strip() for value in values["packages"].split(",")] # type: ignore values["packages"] = [
value.strip() for value in values["packages"].split(",")
] # type: ignore
if isinstance(values.get("packages_from_raw_bash"), str): if isinstance(values.get("packages_from_raw_bash"), str):
out, err = self.check_output_bash_snippet( out, err = self.check_output_bash_snippet(
@ -1164,7 +1166,9 @@ class AptDependenciesAppResource(AppResource):
f"Error while running apt resource packages_from_raw_bash snippet for '{key}' extras:" f"Error while running apt resource packages_from_raw_bash snippet for '{key}' extras:"
) )
logger.error(err) logger.error(err)
values["packages"] = values.get("packages", []) + [value.strip() for value in out.split("\n")] # type: ignore values["packages"] = values.get("packages", []) + [
value.strip() for value in out.split("\n")
] # type: ignore
if ( if (
not isinstance(values.get("repo"), str) not isinstance(values.get("repo"), str)
@ -1291,7 +1295,14 @@ class PortsResource(AppResource):
return used_by_process or used_by_app or used_by_self_provisioning return used_by_process or used_by_app or used_by_self_provisioning
def provision_or_update(self, context: Dict = {}): def provision_or_update(self, context: Dict = {}):
from yunohost.firewall import firewall_allow, firewall_disallow from yunohost.firewall import (
firewall_allow,
firewall_disallow,
firewall_list,
firewall_reload,
)
previous_ports = firewall_list(raw=True)
for name, infos in self.ports.items(): for name, infos in self.ports.items():
setting_name = f"port_{name}" if name != "main" else "port" setting_name = f"port_{name}" if name != "main" else "port"
@ -1322,11 +1333,12 @@ class PortsResource(AppResource):
self.set_setting(setting_name, port_value) self.set_setting(setting_name, port_value)
if infos["exposed"]: if infos["exposed"]:
firewall_allow(infos["exposed"], port_value, reload_only_if_change=True) firewall_allow(infos["exposed"], port_value, no_reload=True)
else: else:
firewall_disallow( firewall_disallow(infos["exposed"], port_value, no_reload=True)
infos["exposed"], port_value, reload_only_if_change=True
) if firewall_list(raw=True) != previous_ports:
firewall_reload()
def deprovision(self, context: Dict = {}): def deprovision(self, context: Dict = {}):
from yunohost.firewall import firewall_disallow from yunohost.firewall import firewall_disallow