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

[fix] Allow yunohost firewall service to be run even if YunoHost is unconfigured

Browse source
This commit is contained in:
kload 2015-10-31 13:58:02 +01:00
parent 813ab01e9d
commit 95cbff27a9
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/actionsmap/yunohost.yml
View file

@ -1017,6 +1017,9 @@ firewall:
reload: reload:
action_help: Reload all firewall rules action_help: Reload all firewall rules
api: PUT /firewall api: PUT /firewall
configuration:
authenticate: false
lock: false
### firewall_allow() ### firewall_allow()
allow: allow:

4
src/yunohost/firewall.py
View file

@ -199,6 +199,10 @@ def firewall_reload():
reloaded = False reloaded = False
errors = False errors = False
# Do not continue if YunoHost is not configured
try: open('/etc/yunohost/installed')
except IOError: return True
# Check if SSH port is allowed # Check if SSH port is allowed
ssh_port = _get_ssh_port() ssh_port = _get_ssh_port()
if ssh_port not in firewall_list()['opened_ports']: if ssh_port not in firewall_list()['opened_ports']: