YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

License & doc generator

Browse source
This commit is contained in:
Kload 2013-07-06 09:53:43 +02:00
parent 0305d0039d
commit 412a4b4ea6
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
yunohost_firewall.py
View file

@ -114,7 +114,7 @@ def firewall_list():
return firewall return firewall
def firewall_reload(upnp=False): def firewall_reload(upnp=False):
''' """
Reload iptables configuration Reload iptables configuration
Keyword arguments: Keyword arguments:
@ -122,7 +122,7 @@ def firewall_reload(upnp=False):
Return Return
Dict Dict
''' """
with open('firewall.yml', 'r') as f: with open('firewall.yml', 'r') as f:
firewall = yaml.load(f) firewall = yaml.load(f)
@ -145,10 +145,10 @@ def firewall_reload(upnp=False):
if upnp: if upnp:
remove_portmapping() 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")): 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');
@ -156,7 +156,7 @@ def firewall_reload(upnp=False):
os.system ("iptables -A INPUT -i lo -j ACCEPT") os.system ("iptables -A INPUT -i lo -j ACCEPT")
os.system ("iptables -A INPUT -p icmp -j ACCEPT") os.system ("iptables -A INPUT -p icmp -j ACCEPT")
os.system ("iptables -P INPUT DROP") os.system ("iptables -P INPUT DROP")
if(os.path.exists("/proc/net/if_inet6")): if(os.path.exists("/proc/net/if_inet6")):
os.system ("ip6tables -A INPUT -i lo -j ACCEPT") os.system ("ip6tables -A INPUT -i lo -j ACCEPT")
os.system ("ip6tables -A INPUT -p icmp -j ACCEPT") os.system ("ip6tables -A INPUT -p icmp -j ACCEPT")
@ -227,7 +227,7 @@ def add_portmapping(protocol=None, upnp=False, ipv6=None,mode=None,):
if upnp and mode=='a': if upnp and mode=='a':
remove_portmapping() remove_portmapping()
if ipv6: ip = 'ipv6' if ipv6: ip = 'ipv6'
else: ip = 'ipv4' else: ip = 'ipv4'
with open('firewall.yml', 'r') as f: with open('firewall.yml', 'r') as f:
@ -274,8 +274,8 @@ def remove_portmapping():
p = upnp.getgenericportmapping(i) p = upnp.getgenericportmapping(i)
if p is None: break if p is None: break
upnp.deleteportmapping(p[0], p[1]) upnp.deleteportmapping(p[0], p[1])
def firewall_installupnp(): def firewall_installupnp():
""" """
Add upnp cron Add upnp cron
@ -284,7 +284,7 @@ def firewall_installupnp():
Return Return
None None
""" """
with open('firewall.yml', 'r') as f: with open('firewall.yml', 'r') as f:
firewall = yaml.load(f) firewall = yaml.load(f)
@ -336,7 +336,7 @@ def firewall_checkupnp():
""" """
with open('firewall.yml', 'r') as f: with open('firewall.yml', 'r') as f:
firewall = yaml.load(f) firewall = yaml.load(f)
if firewall['UPNP']: if firewall['UPNP']:
win_msg(_("UPNP is activated")) win_msg(_("UPNP is activated"))
else: else:
@ -354,7 +354,7 @@ def firewall_stop():
os.system ("iptables -P INPUT ACCEPT") os.system ("iptables -P INPUT ACCEPT")
os.system ("iptables -F") os.system ("iptables -F")
os.system ("iptables -X") os.system ("iptables -X")
os.system ("ip6tables -P INPUT ACCEPT") os.system ("ip6tables -P INPUT ACCEPT")
os.system ("ip6tables -F") os.system ("ip6tables -F")
os.system ("ip6tables -X") os.system ("ip6tables -X")

3
yunohost_monitor.py
View file

@ -85,7 +85,8 @@ def process_check(args):
def monitor_info(memory=False, cpu=False, disk=False, ifconfig=False, uptime=False, public=False): def monitor_info(memory=False, cpu=False, disk=False, ifconfig=False, uptime=False, public=False):
"""
"""
if memory: if memory:
return json.loads(s.getMem()) return json.loads(s.getMem())