Skip to content

Commit 4ffb51e

Browse files
committed
- Added nginx support to the installer.
1 parent e79866f commit 4ffb51e

33 files changed

+1071
-505
lines changed

install/autoupdate.php

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -249,15 +249,21 @@
249249
}
250250
}
251251

252-
if($conf['services']['web'] == true) {
253-
//** Configure Apache
254-
swriteln('Configuring Apache');
255-
$inst->configure_apache();
256-
257-
//** Configure vlogger
258-
swriteln('Configuring vlogger');
259-
$inst->configure_vlogger();
260-
252+
if($conf['services']['web']) {
253+
if($conf['webserver']['server_type'] == 'apache'){
254+
//** Configure Apache
255+
swriteln('Configuring Apache');
256+
$inst->configure_apache();
257+
258+
//** Configure vlogger
259+
swriteln('Configuring vlogger');
260+
$inst->configure_vlogger();
261+
} else {
262+
//** Configure nginx
263+
swriteln('Configuring nginx');
264+
$inst->configure_nginx();
265+
}
266+
261267
//** Configure apps vhost
262268
swriteln('Configuring Apps vhost');
263269
$inst->configure_apps_vhost();
@@ -305,7 +311,9 @@
305311
if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
306312
}
307313
if($conf['services']['web']) {
308-
if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
314+
if($conf['webserver']['server_type'] == 'apache' && $conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
315+
//* Reload is enough for nginx
316+
if($conf['webserver']['server_type'] == 'nginx' && $conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' reload');
309317
if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'])) system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
310318
}
311319
if($conf['services']['dns']) {

install/dist/conf/centos52.conf.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,21 @@
178178
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano';
179179
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
180180

181+
//* Nginx
182+
$conf['nginx']['installed'] = false; // will be detected automatically during installation
183+
$conf['nginx']['user'] = 'nginx';
184+
$conf['nginx']['group'] = 'nginx';
185+
$conf['nginx']['config_dir'] = '/etc/nginx';
186+
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
187+
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
188+
$conf['nginx']['init_script'] = 'nginx';
189+
$conf['nginx']['vhost_port'] = '8080';
190+
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
191+
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
192+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
193+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
194+
$conf['nginx']['php_fpm_start_port'] = 9010;
195+
181196
//* vlogger
182197
$conf['vlogger']['config_dir'] = '/etc';
183198

install/dist/conf/centos53.conf.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,21 @@
178178
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano';
179179
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
180180

181+
//* Nginx
182+
$conf['nginx']['installed'] = false; // will be detected automatically during installation
183+
$conf['nginx']['user'] = 'nginx';
184+
$conf['nginx']['group'] = 'nginx';
185+
$conf['nginx']['config_dir'] = '/etc/nginx';
186+
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
187+
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
188+
$conf['nginx']['init_script'] = 'nginx';
189+
$conf['nginx']['vhost_port'] = '8080';
190+
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
191+
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
192+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
193+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
194+
$conf['nginx']['php_fpm_start_port'] = 9010;
195+
181196
//* vlogger
182197
$conf['vlogger']['config_dir'] = '/etc';
183198

install/dist/conf/debian40.conf.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,18 @@
192192

193193
//* Nginx
194194
$conf['nginx']['installed'] = false; // will be detected automatically during installation
195+
$conf['nginx']['user'] = 'www-data';
196+
$conf['nginx']['group'] = 'www-data';
195197
$conf['nginx']['config_dir'] = '/etc/nginx';
196198
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
197199
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
198200
$conf['nginx']['init_script'] = 'nginx';
201+
$conf['nginx']['vhost_port'] = '8080';
202+
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
203+
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
204+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
205+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
206+
$conf['nginx']['php_fpm_start_port'] = 9010;
199207

200208
//*Ufw
201209
$conf['ufw']['installed'] = false;

install/dist/conf/debian60.conf.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,18 @@
192192

193193
//* Nginx
194194
$conf['nginx']['installed'] = false; // will be detected automatically during installation
195+
$conf['nginx']['user'] = 'www-data';
196+
$conf['nginx']['group'] = 'www-data';
195197
$conf['nginx']['config_dir'] = '/etc/nginx';
196198
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
197199
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
198200
$conf['nginx']['init_script'] = 'nginx';
201+
$conf['nginx']['vhost_port'] = '8080';
202+
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
203+
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
204+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
205+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
206+
$conf['nginx']['php_fpm_start_port'] = 9010;
199207

200208
//* Ufw
201209
$conf['ufw']['installed'] = false;

install/dist/conf/fedora9.conf.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,21 @@
178178
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano';
179179
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
180180

181+
//* Nginx
182+
$conf['nginx']['installed'] = false; // will be detected automatically during installation
183+
$conf['nginx']['user'] = 'nginx';
184+
$conf['nginx']['group'] = 'nginx';
185+
$conf['nginx']['config_dir'] = '/etc/nginx';
186+
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
187+
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
188+
$conf['nginx']['init_script'] = 'nginx';
189+
$conf['nginx']['vhost_port'] = '8080';
190+
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
191+
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
192+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
193+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
194+
$conf['nginx']['php_fpm_start_port'] = 9010;
195+
181196
//* vlogger
182197
$conf['vlogger']['config_dir'] = '/etc';
183198

install/dist/conf/gentoo.conf.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,21 @@
194194
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
195195
$conf['jailkit']['jailkit_chroot_app_programs'] = '/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/less /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/vim';
196196

197+
//* Nginx
198+
$conf['nginx']['installed'] = false; // will be detected automatically during installation
199+
$conf['nginx']['user'] = 'nginx';
200+
$conf['nginx']['group'] = 'nginx';
201+
$conf['nginx']['config_dir'] = '/etc/nginx';
202+
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
203+
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
204+
$conf['nginx']['init_script'] = 'nginx';
205+
$conf['nginx']['vhost_port'] = '8080';
206+
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
207+
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
208+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
209+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
210+
$conf['nginx']['php_fpm_start_port'] = 9010;
211+
197212
//* vlogger
198213
$conf['vlogger']['config_dir'] = '/etc/vlogger';
199214

install/dist/conf/opensuse110.conf.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,21 @@
178178
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
179179
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
180180

181+
//* Nginx
182+
$conf['nginx']['installed'] = false; // will be detected automatically during installation
183+
$conf['nginx']['user'] = 'wwwrun';
184+
$conf['nginx']['group'] = 'www';
185+
$conf['nginx']['config_dir'] = '/etc/nginx';
186+
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
187+
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
188+
$conf['nginx']['init_script'] = 'nginx';
189+
$conf['nginx']['vhost_port'] = '8080';
190+
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
191+
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
192+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
193+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
194+
$conf['nginx']['php_fpm_start_port'] = 9010;
195+
181196
//* vlogger
182197
$conf['vlogger']['config_dir'] = '/etc';
183198

install/dist/conf/opensuse112.conf.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,21 @@
178178
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
179179
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
180180

181+
//* Nginx
182+
$conf['nginx']['installed'] = false; // will be detected automatically during installation
183+
$conf['nginx']['user'] = 'wwwrun';
184+
$conf['nginx']['group'] = 'www';
185+
$conf['nginx']['config_dir'] = '/etc/nginx';
186+
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
187+
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
188+
$conf['nginx']['init_script'] = 'nginx';
189+
$conf['nginx']['vhost_port'] = '8080';
190+
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
191+
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
192+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
193+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
194+
$conf['nginx']['php_fpm_start_port'] = 9010;
195+
181196
//* vlogger
182197
$conf['vlogger']['config_dir'] = '/etc';
183198

install/install.php

Lines changed: 83 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,16 @@
157157
//* Create the MySQL database
158158
$inst->configure_database();
159159

160+
//* Configure Webserver - Apache or nginx
161+
if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
162+
$http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache','nginx'), 'apache');
163+
if($http_server_to_use == 'apache'){
164+
$conf['nginx']['installed'] = false;
165+
} else {
166+
$conf['apache']['installed'] = false;
167+
}
168+
}
169+
160170
//* Insert the Server record into the database
161171
$inst->add_database_server_record();
162172

@@ -217,8 +227,16 @@
217227
}
218228

219229
//* Configure Apache
220-
swriteln('Configuring Apache');
221-
$inst->configure_apache();
230+
if($conf['apache']['installed'] == true){
231+
swriteln('Configuring Apache');
232+
$inst->configure_apache();
233+
}
234+
235+
//* Configure nginx
236+
if($conf['nginx']['installed'] == true){
237+
swriteln('Configuring nginx');
238+
$inst->configure_nginx();
239+
}
222240

223241
//** Configure Vlogger
224242
swriteln('Configuring Vlogger');
@@ -248,6 +266,7 @@
248266
$inst->configure_fail2ban();
249267
}
250268

269+
/*
251270
if($conf['squid']['installed'] == true) {
252271
$conf['services']['proxy'] = true;
253272
swriteln('Configuring Squid');
@@ -257,6 +276,7 @@
257276
swriteln('Configuring Nginx');
258277
$inst->configure_nginx();
259278
}
279+
*/
260280

261281
//* Configure ISPConfig
262282
swriteln('Installing ISPConfig');
@@ -291,7 +311,12 @@
291311
if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
292312
if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
293313
if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
294-
if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
314+
if($conf['apache']['installed'] == true && $conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
315+
//* Reload is enough for nginx
316+
if($conf['nginx']['installed'] == true){
317+
if($conf['nginx']['php_fpm_init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['nginx']['php_fpm_init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['php_fpm_init_script'].' reload');
318+
if($conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' reload');
319+
}
295320
if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'])) system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
296321
if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script'])) system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
297322
if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script'])) system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
@@ -353,6 +378,16 @@
353378

354379
//* Create the mysql database
355380
$inst->configure_database();
381+
382+
//* Configure Webserver - Apache or nginx
383+
if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
384+
$http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache','nginx'), 'apache');
385+
if($http_server_to_use == 'apache'){
386+
$conf['nginx']['installed'] = false;
387+
} else {
388+
$conf['apache']['installed'] = false;
389+
}
390+
}
356391

357392
//* Insert the Server record into the database
358393
swriteln('Adding ISPConfig server record to database.');
@@ -449,6 +484,7 @@
449484

450485
}
451486

487+
/*
452488
//** Configure Squid
453489
if(strtolower($inst->simple_query('Configure Proxy Server', array('y','n'),'y') ) == 'y') {
454490
if($conf['squid']['installed'] == true) {
@@ -463,21 +499,42 @@
463499
if($conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script']))system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
464500
}
465501
}
502+
*/
466503

467504
//** Configure Apache
468-
swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure Apache Server' option.\n");
469-
if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {
470-
$conf['services']['web'] = true;
471-
swriteln('Configuring Apache');
472-
$inst->configure_apache();
473-
474-
//** Configure Vlogger
475-
swriteln('Configuring Vlogger');
476-
$inst->configure_vlogger();
477-
478-
//** Configure apps vhost
479-
swriteln('Configuring Apps vhost');
480-
$inst->configure_apps_vhost();
505+
if($conf['apache']['installed'] == true){
506+
swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure Apache Server' option.\n");
507+
if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {
508+
$conf['services']['web'] = true;
509+
swriteln('Configuring Apache');
510+
$inst->configure_apache();
511+
512+
//** Configure Vlogger
513+
swriteln('Configuring Vlogger');
514+
$inst->configure_vlogger();
515+
516+
//** Configure apps vhost
517+
swriteln('Configuring Apps vhost');
518+
$inst->configure_apps_vhost();
519+
}
520+
}
521+
522+
//** Configure nginx
523+
if($conf['nginx']['installed'] == true){
524+
swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure nginx Server' option.\n");
525+
if(strtolower($inst->simple_query('Configure nginx Server',array('y','n'),'y')) == 'y') {
526+
$conf['services']['web'] = true;
527+
swriteln('Configuring nginx');
528+
$inst->configure_nginx();
529+
530+
//** Configure Vlogger
531+
//swriteln('Configuring Vlogger');
532+
//$inst->configure_vlogger();
533+
534+
//** Configure apps vhost
535+
swriteln('Configuring Apps vhost');
536+
$inst->configure_apps_vhost();
537+
}
481538
}
482539

483540
//** Configure Firewall
@@ -520,7 +577,10 @@
520577
*/
521578

522579
//** Customise the port ISPConfig runs on
523-
$conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
580+
$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080');
581+
if($conf['apache']['installed'] == true) $conf['apache']['vhost_port'] = $ispconfig_vhost_port;
582+
if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port'] = $ispconfig_vhost_port;
583+
unset($ispconfig_vhost_port);
524584

525585
if(strtolower($inst->simple_query('Enable SSL for the ISPConfig web interface',array('y','n'),'y')) == 'y') {
526586
$inst->make_ispconfig_ssl_cert();
@@ -541,7 +601,12 @@
541601
//* Configure ISPConfig
542602
swriteln('Installing ISPConfig crontab');
543603
$inst->install_crontab();
544-
if($conf['apache']['init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
604+
if($conf['apache']['installed'] == true && $conf['apache']['init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
605+
//* Reload is enough for nginx
606+
if($conf['nginx']['installed'] == true){
607+
if($conf['nginx']['php_fpm_init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['nginx']['php_fpm_init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['php_fpm_init_script'].' reload');
608+
if($conf['nginx']['init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' reload');
609+
}
545610

546611

547612

0 commit comments

Comments
 (0)