move firewall.yml to /etc/yunohost

yunohost_firewall.py

@@ -16,7 +16,6 @@ except ImportError:
 from yunohost import YunoHostError, win_msg
 
 
-
 def firewall_allow(protocol=None, port=None, ipv6=None, upnp=False):
     """
     Allow port in iptables
@@ -88,10 +87,11 @@ def firewall_list():
         Dict
 
     """
-    with open ('firewall.yml') as f:
+    with open('/etc/yunohost/firewall.yml') as f:
         firewall = yaml.load(f)
     return firewall
 
+
 def firewall_reload(upnp=False):
     '''
     Reload iptables configuration
@@ -102,7 +102,7 @@ def firewall_reload(upnp=False):
     Return
         Dict
     '''
-    with open('firewall.yml', 'r') as f:
+    with open('/etc/yunohost/firewall.yml', 'r') as f:
         firewall = yaml.load(f)
 
     os.system("iptables -P INPUT ACCEPT")
@@ -125,12 +125,12 @@ def firewall_reload(upnp=False):
     if upnp:
         remove_portmapping()
 
-    add_portmapping('TCP', upnp, False,'r');
+    add_portmapping('TCP', upnp, False, 'r')
-    add_portmapping('UDP', upnp, False,'r');
+    add_portmapping('UDP', upnp, False, 'r')
 
     if(os.path.exists("/proc/net/if_inet6")):
-        add_portmapping('TCP', upnp, True,'r');
+        add_portmapping('TCP', upnp, True, 'r')
-        add_portmapping('UDP', upnp, True,'r');
+        add_portmapping('UDP', upnp, True, 'r')
 
     os.system("iptables -A INPUT -i lo -j ACCEPT")
     os.system("iptables -A INPUT -p icmp -j ACCEPT")
@@ -159,10 +159,12 @@ def update_yml(port=None, protocol=None, mode=None, ipv6=None):
     Return
         None
     """
-    if ipv6: ip = 'ipv6'
+    if ipv6:
-    else:    ip = 'ipv4'
+        ip = 'ipv6'
+    else:
+        ip = 'ipv4'
 
-    with open('firewall.yml', 'r') as f:
+    with open('/etc/yunohost/firewall.yml', 'r') as f:
         firewall = yaml.load(f)
 
     if mode == 'a':
@@ -181,9 +183,9 @@ def update_yml(port=None, protocol=None, mode=None, ipv6=None):
 
     firewall[ip][protocol].sort()
 
-    os.system("mv firewall.yml firewall.yml.old")
+    os.system("mv /etc/yunohost/firewall.yml /etc/yunohost/firewall.yml.old")
 
-    with open('firewall.yml', 'w') as f:
+    with open('/etc/yunohost/firewall.yml', 'w') as f:
         yaml.dump(firewall, f)
 
 
@@ -200,16 +202,18 @@ def add_portmapping(protocol=None, upnp=False, ipv6=None,mode=None,):
         None
     """
     if ipv6:
-        os.system ("ip6tables -P INPUT ACCEPT")
+        os.system _("ip6tables -P INPUT ACCEPT")
     else:
-        os.system ("iptables -P INPUT ACCEPT")
+        os.system _("iptables -P INPUT ACCEPT")
 
     if upnp and mode == 'a':
         remove_portmapping()
 
-    if ipv6: ip = 'ipv6'
+    if ipv6:
-    else:    ip = 'ipv4'
+        ip = 'ipv6'
-    with open('firewall.yml', 'r') as f:
+    else:
+        ip = 'ipv4'
+    with open('/etc/yunohost/firewall.yml', 'r') as f:
         firewall = yaml.load(f)
 
     for i, port in enumerate(firewall[ip][protocol]):
@@ -227,6 +231,7 @@ def add_portmapping(protocol=None, upnp=False, ipv6=None,mode=None,):
 
     os.system("iptables -P INPUT DROP")
 
+
 def remove_portmapping():
     """
     Remove all portmapping rules in the igd device
@@ -251,7 +256,8 @@ def remove_portmapping():
     # list the redirections :
     for i in xrange(100):
         p = upnp.getgenericportmapping(i)
-        if p is None: break
+        if p is None:
+            break
         upnp.deleteportmapping(p[0], p[1])
 
 
@@ -264,18 +270,18 @@ def firewall_installupnp():
         None
     """
 
-    with open('firewall.yml', 'r') as f:
+    with open('/etc/yunohost/firewall.yml', 'r') as f:
         firewall = yaml.load(f)
 
-    firewall['UPNP']=True;
+    firewall['UPNP'] = True
 
     os.system("touch /etc/cron.d/yunohost-firewall")
     os.system("echo '*/50 * * * * root yunohost firewall reload -u>>/dev/null'>/etc/cron.d/yunohost-firewall")
     win_msg(_("UPNP cron installed"))
 
-    os.system("mv firewall.yml firewall.yml.old")
+    os.system("mv /etc/yunohost/firewall.yml /etc/yunohost/firewall.yml.old")
 
-    with open('firewall.yml', 'w') as f:
+    with open('/etc/yunohost/firewall.yml', 'w') as f:
         yaml.dump(firewall, f)
 
 
@@ -287,10 +293,10 @@ def firewall_removeupnp():
     Return
         None
     """
-    with open('firewall.yml', 'r') as f:
+    with open('/etc/yunohost/firewall.yml', 'r') as f:
         firewall = yaml.load(f)
 
-    firewall['UPNP']=False;
+    firewall['UPNP'] = False
 
     try:
         os.remove("/etc/cron.d/yunohost-firewall")
@@ -299,11 +305,12 @@ def firewall_removeupnp():
 
     win_msg(_("UPNP cron removed"))
 
-    os.system("mv firewall.yml firewall.yml.old")
+    os.system("mv /etc/yunohost/firewall.yml /etc/yunohost/firewall.yml.old")
 
-    with open('firewall.yml', 'w') as f:
+    with open('/etc/yunohost/firewall.yml', 'w') as f:
         yaml.dump(firewall, f)
 
+
 def firewall_checkupnp():
     """
     Check if UPNP is installed
@@ -313,7 +320,7 @@ def firewall_checkupnp():
         0 if installed
         1 if not
     """
-    with open('firewall.yml', 'r') as f:
+    with open('/etc/yunohost/firewall.yml', 'r') as f:
         firewall = yaml.load(f)
 
         if firewall['UPNP']:
@@ -321,6 +328,7 @@ def firewall_checkupnp():
         else:
             raise YunoHostError(167, _("UPNP not activated!"))
 
+
 def firewall_stop():
     """
     Stop firewall
@@ -339,4 +347,3 @@ def firewall_stop():
     os.system("ip6tables -X")
     if(os.path.exists("/etc/cron.d/yunohost-firewall")):
         firewall_removeupnp()
-