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

remove now unused 'reload_only_if_change' stuff

Browse source
This commit is contained in:
OniriCorpe 2024-05-21 22:50:53 +02:00
parent b8b683bd66
commit d354c75dbf
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/firewall.py
View file

@ -38,7 +38,6 @@ def firewall_allow(
ipv6_only=False, ipv6_only=False,
no_upnp=False, no_upnp=False,
no_reload=False, no_reload=False,
reload_only_if_change=False,
): ):
""" """
Allow connections on a port Allow connections on a port
@ -86,10 +85,7 @@ def firewall_allow(
changed = True changed = True
else: else:
ipv = "IPv%s" % i[3] ipv = "IPv%s" % i[3]
if not reload_only_if_change: logger.warning(m18n.n("port_already_opened", port=port, ip_version=ipv))
logger.warning(
m18n.n("port_already_opened", port=port, ip_version=ipv)
)
# Add port forwarding with UPnP # Add port forwarding with UPnP
if not no_upnp and port not in firewall["uPnP"][p]: if not no_upnp and port not in firewall["uPnP"][p]:
firewall["uPnP"][p].append(port) firewall["uPnP"][p].append(port)
@ -101,9 +97,7 @@ def firewall_allow(
# Update and reload firewall # Update and reload firewall
_update_firewall_file(firewall) _update_firewall_file(firewall)
if (not reload_only_if_change and not no_reload) or ( if (not no_reload) or (changed):
reload_only_if_change and changed
):
return firewall_reload() return firewall_reload()
@ -114,7 +108,6 @@ def firewall_disallow(
ipv6_only=False, ipv6_only=False,
upnp_only=False, upnp_only=False,
no_reload=False, no_reload=False,
reload_only_if_change=False,
): ):
""" """
Disallow connections on a port Disallow connections on a port
@ -169,10 +162,7 @@ def firewall_disallow(
changed = True changed = True
else: else:
ipv = "IPv%s" % i[3] ipv = "IPv%s" % i[3]
if not reload_only_if_change: logger.warning(m18n.n("port_already_closed", port=port, ip_version=ipv))
logger.warning(
m18n.n("port_already_closed", port=port, ip_version=ipv)
)
# Remove port forwarding with UPnP # Remove port forwarding with UPnP
if upnp and port in firewall["uPnP"][p]: if upnp and port in firewall["uPnP"][p]:
firewall["uPnP"][p].remove(port) firewall["uPnP"][p].remove(port)
@ -182,9 +172,7 @@ def firewall_disallow(
# Update and reload firewall # Update and reload firewall
_update_firewall_file(firewall) _update_firewall_file(firewall)
if (not reload_only_if_change and not no_reload) or ( if (not no_reload) or (changed):
reload_only_if_change and changed
):
return firewall_reload() return firewall_reload()