From 0c5b4264f25189b1fb7af26b47fc7746f94e4563 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 7 Sep 2011 13:14:49 +0000
Subject: [PATCH] Fixed: FS#1692 - adding new server to multi-server setup
seems to enable too much services.
---
install/dist/lib/fedora.lib.php | 8 +++++---
install/dist/lib/opensuse.lib.php | 8 +++++---
install/lib/installer_base.lib.php | 10 ++++++----
install/tpl/server.ini.master | 2 +-
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 56e7a04da1..b9581c2d0c 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -893,9 +893,11 @@ class installer_dist extends installer_base {
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);
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 6a0fdbb03c..f9802fff61 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -906,9 +906,11 @@ class installer_dist extends installer_base {
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');
+ }
}
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 86db75fe89..1a3934f6c4 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1680,10 +1680,12 @@ class installer_base {
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')) {
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 4d2652e3f6..bb8c9b516d 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -13,7 +13,7 @@ hostname=server1.domain.tld
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
--
GitLab