From 1a14f4d8a05ff1ccc781bf2c2a2569244548f9c6 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 14 Nov 2008 11:03:24 -0500
Subject: [PATCH] Fixed #250. Services are only restarted if a startscript is defined in the $config variable during installation or update.
---
install/install.php | 50 ++++++++++++------------
install/update.php | 26 ++++++------
install/dist/conf/centos52.conf.php | 6 +-
3 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php
index 24b6e64..e3cc230 100644
--- a/install/dist/conf/centos52.conf.php
+++ b/install/dist/conf/centos52.conf.php
@@ -55,9 +55,9 @@
$conf['courier']['config_dir'] = '/etc/authlib';
$conf['courier']['courier-authdaemon'] = 'courier-authlib';
$conf['courier']['courier-imap'] = 'courier-imap';
-$conf['courier']['courier-imap-ssl'] = 'courier-imap';
-$conf['courier']['courier-pop'] = 'courier-imap';
-$conf['courier']['courier-pop-ssl'] = 'courier-imap';
+$conf['courier']['courier-imap-ssl'] = '';
+$conf['courier']['courier-pop'] = '';
+$conf['courier']['courier-pop-ssl'] = '';
//* SASL
$conf['saslauthd']['config'] = '/etc/sysconfig/saslauthd';
diff --git a/install/install.php b/install/install.php
index 08f21c2..76823fe 100644
--- a/install/install.php
+++ b/install/install.php
@@ -203,19 +203,19 @@
$inst->install_crontab();
swriteln('Restarting services ...');
- system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
- system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
+ if($conf['mysql']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
+ if($conf['postfix']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
+ if($conf['saslauthd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
+ if($conf['amavis']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
+ if($conf['clamav']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
+ if($conf['courier']['courier-authdaemon'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
+ if($conf['courier']['courier-imap'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
+ if($conf['courier']['courier-imap-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
+ if($conf['courier']['courier-pop'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
+ if($conf['courier']['courier-pop-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+ if($conf['apache']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
+ if($conf['pureftpd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
+ if($conf['mydns']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
}else{
@@ -261,15 +261,15 @@
swriteln('Configuring Getmail');
$inst->configure_getmail();
- system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+ if($conf['postfix']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
+ if($conf['saslauthd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
+ if($conf['amavis']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
+ if($conf['clamav']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
+ if($conf['courier']['courier-authdaemon'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
+ if($conf['courier']['courier-imap'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
+ if($conf['courier']['courier-imap-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
+ if($conf['courier']['courier-pop'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
+ if($conf['courier']['courier-pop-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
}
//** Configure Jailkit
@@ -282,14 +282,14 @@
if(strtolower($inst->simple_query('Configure FTP Server', array('y','n'),'y') ) == 'y') {
swriteln('Configuring Pureftpd');
$inst->configure_pureftpd();
- system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
+ if($conf['pureftpd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
}
//** Configure MyDNS
if(strtolower($inst->simple_query('Configure DNS Server',array('y','n'),'y')) == 'y') {
swriteln('Configuring MyDNS');
$inst->configure_mydns();
- system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart');
+ if($conf['mydns']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
}
//** Configure Apache
@@ -341,7 +341,7 @@
//* Configure ISPConfig
swriteln('Installing Crontab');
$inst->install_crontab();
- system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
+ if($conf['apache']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
diff --git a/install/update.php b/install/update.php
index 6c7ce67..fe77547 100644
--- a/install/update.php
+++ b/install/update.php
@@ -250,19 +250,19 @@
//** Restart services:
if($reconfigure_services_answer == 'yes') {
swriteln('Restarting services ...');
- system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
- system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
- system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
- system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
+ if($conf['mysql']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
+ if($conf['postfix']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
+ if($conf['saslauthd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
+ if($conf['amavis']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
+ if($conf['clamav']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
+ if($conf['courier']['courier-authdaemon'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
+ if($conf['courier']['courier-imap'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
+ if($conf['courier']['courier-imap-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
+ if($conf['courier']['courier-pop'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
+ if($conf['courier']['courier-pop-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+ if($conf['apache']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
+ if($conf['pureftpd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
+ if($conf['mydns']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
}
echo "Update finished.\n";
--
Gitblit v1.9.1