From 9fb6c8a1670596493d216500f6805954bf2acde1 Mon Sep 17 00:00:00 2001 From: Kload Date: Mon, 3 Mar 2014 14:15:19 +0100 Subject: [PATCH] Remove light mode and change hostname in /etc/amavis/conf.d/50-user --- yunohost_tools.py | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/yunohost_tools.py b/yunohost_tools.py index 320d6472..70e56775 100644 --- a/yunohost_tools.py +++ b/yunohost_tools.py @@ -123,8 +123,9 @@ def tools_maindomain(old_domain=None, new_domain=None, dyndns=False): '/etc/metronome/metronome.cfg.lua', '/etc/dovecot/dovecot.conf', '/usr/share/yunohost/yunohost-config/others/startup', - '/home/yunohost.backup/tahoe/tahoe.cfg' - '/etc/amavis/conf.d/05-node_id' + '/home/yunohost.backup/tahoe/tahoe.cfg', + '/etc/amavis/conf.d/05-node_id', + '/etc/amavis/conf.d/50-user' ] config_dir = [] @@ -220,21 +221,6 @@ def tools_postinstall(domain, password, dyndns=False): if os.system('hostname -d') != 0: os.system('hostname yunohost.yunohost.org') - # Activate "full" mode if RAM >= 512MB - for L in open("/proc/meminfo"): - if "MemTotal" in L: - if int(L.split(" ")[-2]) < 500000 or not requests.get('http://ip.yunohost.org/'): - os.system('touch /etc/yunohost/light') - else: - os.system('service dspam stop') - os.system('chmod -x /etc/cron.daily/dspam') - os.system('update-rc.d dspam remove') - os.system('sed -i "s/yes/no/g" /etc/default/dspam') - os.system('sed -i "s/dspam=no/dspam=yes/" /etc/yunohost/yunohost.conf') - os.system('apt-get install -y -qq yunohost-config-amavis') - os.system('service amavis start') - os.system('apt-get install --reinstall -y -qq yunohost-config-postfix yunohost-config-dovecot') - # Create SSL CA ssl_dir = '/usr/share/yunohost/yunohost-config/ssl/yunoCA' command_list = [