Merge branch 'master' of myko-serveur.fr:titoko/moulinette into dev

This commit is contained in:
titoko 2013-03-03 00:25:07 +00:00
commit 5a66184f01
2 changed files with 31 additions and 29 deletions

View file

@ -2,8 +2,11 @@
import os
import sys
try:
import miniupnpc
except ImportError:
sys.stderr.write('Error: Yunohost CLI Require miniupnpc lib\n')
sys.exit(1)
try:
import yaml
except ImportError:
@ -45,7 +48,6 @@ def firewall_allow(protocol=None,port=None,ipv6=None,upnp=False):
return firewall_reload(upnp)
def firewall_disallow(protocol=None,port=None,ipv6=None,upnp=False):
"""
Disallow port in iptables