Fixed: FS#1692 - adding new server to multi-server setup seems to enable to...

tbrehm

2011-09-07 0c5b4264f25189b1fb7af26b47fc7746f94e4563

Fixed: FS#1692 - adding new server to multi-server setup seems to enable too much services.

 install/dist/lib/fedora.lib.php

@@ -893,9 +893,11 @@
        if(!is_dir($conf['ispconfig_log_dir'])) mkdir($conf['ispconfig_log_dir']);
        if(!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) exec('touch '.$conf['ispconfig_log_dir'].'/ispconfig.log');
        
        exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
        exec('chown getmail /usr/local/bin/run-getmail.sh');
        exec('chmod 744 /usr/local/bin/run-getmail.sh');
        if(is_user('getmail')) {
            exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
            exec('chown getmail /usr/local/bin/run-getmail.sh');
            exec('chmod 744 /usr/local/bin/run-getmail.sh');
        }
        
        // Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail
        replaceLine('/etc/sudoers','Defaults    requiretty','#Defaults    requiretty',0,0);

 install/dist/lib/opensuse.lib.php

@@ -906,9 +906,11 @@
        if(!is_dir($conf['ispconfig_log_dir'])) mkdir($conf['ispconfig_log_dir']);
        if(!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) exec('touch '.$conf['ispconfig_log_dir'].'/ispconfig.log');
        
        exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
        exec('chown getmail /usr/local/bin/run-getmail.sh');
        exec('chmod 744 /usr/local/bin/run-getmail.sh');
        if(is_user('getmail')) {
            exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
            exec('chown getmail /usr/local/bin/run-getmail.sh');
            exec('chmod 744 /usr/local/bin/run-getmail.sh');
        }
        
        
    }

 install/lib/installer_base.lib.php

@@ -1680,10 +1680,12 @@
            if(!is_dir($conf['ispconfig_log_dir'])) mkdir($conf['ispconfig_log_dir'], 0755);
            touch($conf['ispconfig_log_dir'].'/ispconfig.log');
        }

        rename($install_dir.'/server/scripts/run-getmail.sh','/usr/local/bin/run-getmail.sh');
        if(is_user('getmail')) chown('/usr/local/bin/run-getmail.sh', 'getmail');
        chmod('/usr/local/bin/run-getmail.sh', 0744);
		
        if(is_user('getmail')) {
            rename($install_dir.'/server/scripts/run-getmail.sh','/usr/local/bin/run-getmail.sh');
            if(is_user('getmail')) chown('/usr/local/bin/run-getmail.sh', 'getmail');
            chmod('/usr/local/bin/run-getmail.sh', 0744);
        }

        //* Add Log-Rotation
        if (is_dir('/etc/logrotate.d')) {

 install/tpl/server.ini.master

@@ -13,7 +13,7 @@
nameservers=192.168.0.1,192.168.0.2
loglevel=2
backup_dir=/var/backup
backup_dir_ftpread=y
backup_dir_ftpread=n

[mail]
module=postfix_mysql