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

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

50
parse_args
View file

@ -2,22 +2,22 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
__credits__ = """ __credits__ = """
Copyright (C) 2012 YunoHost Copyright (C) 2012 YunoHost
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with this program; if not, see http://www.gnu.org/licenses along with this program; if not, see http://www.gnu.org/licenses
""" """
__author__ = 'Kload <kload@kload.fr>' __author__ = 'Kload <kload@kload.fr>'
__version__ = '2.0 beta1' __version__ = '2.0 beta1'
import os import os
@ -46,15 +46,15 @@ except ImportError:
def parse_dict(action_map): def parse_dict(action_map):
""" """
Turn action dictionnary to parser, subparsers and arguments Turn action dictionnary to parser, subparsers and arguments
Keyword arguments: Keyword arguments:
action_map -- Multi-level dictionnary of categories/actions/arguments list action_map -- Multi-level dictionnary of categories/actions/arguments list
Returns: Returns:
Namespace of args Namespace of args
""" """
# Intialize parsers # Intialize parsers
parsers = subparsers_category = subparsers_action = {} parsers = subparsers_category = subparsers_action = {}
parsers['general'] = argparse.ArgumentParser() parsers['general'] = argparse.ArgumentParser()
@ -152,15 +152,15 @@ Namespace of args
def main(): def main():
""" """
Main instructions Main instructions
Parse the action_dict and execute the action-specific function, Parse the action_dict and execute the action-specific function,
then print json or pretty result if executed in a tty :) then print json or pretty result if executed in a tty :)
Returns: Returns:
int -- 0 or error code int -- 0 or error code
""" """
if len(sys.argv) < 2: if len(sys.argv) < 2:
sys.argv.append('-h') sys.argv.append('-h')

10
yunohost_firewall.py
View file

@ -2,8 +2,11 @@
import os import os
import sys import sys
import miniupnpc try:
import miniupnpc
except ImportError:
sys.stderr.write('Error: Yunohost CLI Require miniupnpc lib\n')
sys.exit(1)
try: try:
import yaml import yaml
except ImportError: except ImportError:
@ -45,7 +48,6 @@ def firewall_allow(protocol=None,port=None,ipv6=None,upnp=False):
return firewall_reload(upnp) return firewall_reload(upnp)
def firewall_disallow(protocol=None,port=None,ipv6=None,upnp=False): def firewall_disallow(protocol=None,port=None,ipv6=None,upnp=False):
""" """
Disallow port in iptables Disallow port in iptables
@ -245,7 +247,7 @@ def add_portmapping(protocol=None,upnp=False,ipv6=None):
firewall = yaml.load(f) firewall = yaml.load(f)
for i,port in enumerate (firewall[ip][protocol]): for i,port in enumerate (firewall[ip][protocol]):
os.system ("iptables -A INPUT -p"+ protocol +"-i eth0 --dport "+ str(port) +" -j ACCEPT") os.system ("iptables -A INPUT -p "+ protocol +" -i eth0 --dport "+ str(port) +" -j ACCEPT")
if upnp: if upnp:
upnp.addportmapping(port,protocol,upnp.lanaddr,port,'yunohost firewall : port %u' % port, '') upnp.addportmapping(port,protocol,upnp.lanaddr,port,'yunohost firewall : port %u' % port, '')