From 9f23945ed7b271a0232516bfc75592ca25a6678a Mon Sep 17 00:00:00 2001 From: Kload Date: Sat, 17 May 2014 21:42:30 +0200 Subject: [PATCH] [fix] Remove --no-ldap arguments --- app.py | 2 +- firewall.py | 6 +++--- monitor.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app.py b/app.py index 2974a9544..5c15c55a3 100644 --- a/app.py +++ b/app.py @@ -90,7 +90,7 @@ def app_fetchlist(url=None, name=None): os.rename('%s.tmp' % list_file, list_file) os.system("touch /etc/cron.d/yunohost-applist-%s" % name) - os.system("echo '00 00 * * * root yunohost app fetchlist -u %s -n %s --no-ldap > /dev/null 2>&1' >/etc/cron.d/yunohost-applist-%s" % (url, name, name)) + os.system("echo '00 00 * * * root yunohost app fetchlist -u %s -n %s > /dev/null 2>&1' >/etc/cron.d/yunohost-applist-%s" % (url, name, name)) msignals.display(m18n.n('list_fetched'), 'success') diff --git a/firewall.py b/firewall.py index b5c2a478d..ca2fef19e 100644 --- a/firewall.py +++ b/firewall.py @@ -191,7 +191,7 @@ def firewall_reload(): for protocol in ['TCP', 'UDP']: for port in firewall['ipv6'][protocol]: os.system("ip6tables -A INPUT -p %s --dport %d -j ACCEPT" % (protocol, port)) - + os.system("ip6tables -A INPUT -i lo -j ACCEPT") os.system("ip6tables -A INPUT -p icmpv6 -j ACCEPT") os.system("ip6tables -P INPUT DROP") @@ -217,7 +217,7 @@ def firewall_upnp(action=None): if action == 'enable': firewall['uPnP']['enabled'] = True - + with open('/etc/cron.d/yunohost-firewall', 'w+') as f: f.write('*/50 * * * * root PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin yunohost firewall reload >>/dev/null') @@ -237,7 +237,7 @@ def firewall_upnp(action=None): try: upnpc.deleteportmapping(port, protocol) except: pass except: pass - + try: os.remove('/etc/cron.d/yunohost-firewall') except: pass diff --git a/monitor.py b/monitor.py index a2e7f8a18..0ab48bbcd 100644 --- a/monitor.py +++ b/monitor.py @@ -386,9 +386,9 @@ def monitor_enable(no_stats=False): if not no_stats: cmd = 'yunohost monitor update-stats' # day: every 5 min # week: every 1 h # month: every 4 h # - rules = ('*/5 * * * * root %(cmd)s day --no-ldap >> /dev/null\n' + \ - '3 * * * * root %(cmd)s week --no-ldap >> /dev/null\n' + \ - '6 */4 * * * root %(cmd)s month --no-ldap >> /dev/null') % {'cmd': cmd} + rules = ('*/5 * * * * root %(cmd)s day >> /dev/null\n' + \ + '3 * * * * root %(cmd)s week >> /dev/null\n' + \ + '6 */4 * * * root %(cmd)s month >> /dev/null') % {'cmd': cmd} os.system("touch %s" % crontab_path) os.system("echo '%s' >%s" % (rules, crontab_path))