Skip to content

Commit 1a14f4d

Browse files
tbrehmtbrehm
committed
Fixed #250. Services are only restarted if a startscript is defined in the $config variable during installation or update.
1 parent 59cfc6e commit 1a14f4d

File tree

3 files changed

+41
-41
lines changed

3 files changed

+41
-41
lines changed

‎install/dist/conf/centos52.conf.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
$conf['courier']['config_dir'] = '/etc/authlib';
5656
$conf['courier']['courier-authdaemon'] = 'courier-authlib';
5757
$conf['courier']['courier-imap'] = 'courier-imap';
58-
$conf['courier']['courier-imap-ssl'] = 'courier-imap';
59-
$conf['courier']['courier-pop'] = 'courier-imap';
60-
$conf['courier']['courier-pop-ssl'] = 'courier-imap';
58+
$conf['courier']['courier-imap-ssl'] = '';
59+
$conf['courier']['courier-pop'] = '';
60+
$conf['courier']['courier-pop-ssl'] = '';
6161

6262
//* SASL
6363
$conf['saslauthd']['config'] = '/etc/sysconfig/saslauthd';

‎install/install.php‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -203,19 +203,19 @@
203203
$inst->install_crontab();
204204

205205
swriteln('Restarting services ...');
206-
system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
207-
system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
208-
system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
209-
system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
210-
system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
211-
system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
212-
system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
213-
system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
214-
system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
215-
system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
216-
system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
217-
system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
218-
system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
206+
if($conf['mysql']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
207+
if($conf['postfix']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
208+
if($conf['saslauthd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
209+
if($conf['amavis']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
210+
if($conf['clamav']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
211+
if($conf['courier']['courier-authdaemon'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
212+
if($conf['courier']['courier-imap'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
213+
if($conf['courier']['courier-imap-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
214+
if($conf['courier']['courier-pop'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
215+
if($conf['courier']['courier-pop-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
216+
if($conf['apache']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
217+
if($conf['pureftpd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
218+
if($conf['mydns']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
219219

220220
}else{
221221

@@ -261,15 +261,15 @@
261261
swriteln('Configuring Getmail');
262262
$inst->configure_getmail();
263263

264-
system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
265-
system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
266-
system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
267-
system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
268-
system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
269-
system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
270-
system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
271-
system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
272-
system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
264+
if($conf['postfix']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
265+
if($conf['saslauthd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
266+
if($conf['amavis']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
267+
if($conf['clamav']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
268+
if($conf['courier']['courier-authdaemon'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
269+
if($conf['courier']['courier-imap'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
270+
if($conf['courier']['courier-imap-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
271+
if($conf['courier']['courier-pop'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
272+
if($conf['courier']['courier-pop-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
273273
}
274274

275275
//** Configure Jailkit
@@ -282,14 +282,14 @@
282282
if(strtolower($inst->simple_query('Configure FTP Server', array('y','n'),'y') ) == 'y') {
283283
swriteln('Configuring Pureftpd');
284284
$inst->configure_pureftpd();
285-
system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
285+
if($conf['pureftpd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
286286
}
287287

288288
//** Configure MyDNS
289289
if(strtolower($inst->simple_query('Configure DNS Server',array('y','n'),'y')) == 'y') {
290290
swriteln('Configuring MyDNS');
291291
$inst->configure_mydns();
292-
system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart');
292+
if($conf['mydns']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
293293
}
294294

295295
//** Configure Apache
@@ -341,7 +341,7 @@
341341
//* Configure ISPConfig
342342
swriteln('Installing Crontab');
343343
$inst->install_crontab();
344-
system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
344+
if($conf['apache']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
345345

346346

347347

‎install/update.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -250,19 +250,19 @@
250250
//** Restart services:
251251
if($reconfigure_services_answer == 'yes') {
252252
swriteln('Restarting services ...');
253-
system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
254-
system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
255-
system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
256-
system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
257-
system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
258-
system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
259-
system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
260-
system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
261-
system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
262-
system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
263-
system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
264-
system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
265-
system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
253+
if($conf['mysql']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
254+
if($conf['postfix']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
255+
if($conf['saslauthd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
256+
if($conf['amavis']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
257+
if($conf['clamav']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
258+
if($conf['courier']['courier-authdaemon'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
259+
if($conf['courier']['courier-imap'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
260+
if($conf['courier']['courier-imap-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
261+
if($conf['courier']['courier-pop'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
262+
if($conf['courier']['courier-pop-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
263+
if($conf['apache']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
264+
if($conf['pureftpd']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
265+
if($conf['mydns']['init_script'] != '') system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
266266
}
267267

268268
echo "Update finished.\n";

0 commit comments

Comments
 (0)