Merge remote-tracking branch 'origin/unstable' into unstable

This commit is contained in:
Weblate 2015-10-31 13:58:36 +01:00
commit 923ca0a75b
2 changed files with 7 additions and 0 deletions

View file

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

View file

@ -199,6 +199,10 @@ def firewall_reload():
reloaded = 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
ssh_port = _get_ssh_port()
if ssh_port not in firewall_list()['opened_ports']: