|
157 | 157 | //* Create the MySQL database |
158 | 158 | $inst->configure_database(); |
159 | 159 |
|
| 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 | + |
160 | 170 | //* Insert the Server record into the database |
161 | 171 | $inst->add_database_server_record(); |
162 | 172 |
|
|
217 | 227 | } |
218 | 228 |
|
219 | 229 | //* 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 | + } |
222 | 240 |
|
223 | 241 | //** Configure Vlogger |
224 | 242 | swriteln('Configuring Vlogger'); |
|
248 | 266 | $inst->configure_fail2ban(); |
249 | 267 | } |
250 | 268 |
|
| 269 | + /* |
251 | 270 | if($conf['squid']['installed'] == true) { |
252 | 271 | $conf['services']['proxy'] = true; |
253 | 272 | swriteln('Configuring Squid'); |
|
257 | 276 | swriteln('Configuring Nginx'); |
258 | 277 | $inst->configure_nginx(); |
259 | 278 | } |
| 279 | + */ |
260 | 280 |
|
261 | 281 | //* Configure ISPConfig |
262 | 282 | swriteln('Installing ISPConfig'); |
|
291 | 311 | 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'); |
292 | 312 | if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart'); |
293 | 313 | 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 | + } |
295 | 320 | if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'])) system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart'); |
296 | 321 | 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'); |
297 | 322 | 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 | 378 |
|
354 | 379 | //* Create the mysql database |
355 | 380 | $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 | + } |
356 | 391 |
|
357 | 392 | //* Insert the Server record into the database |
358 | 393 | swriteln('Adding ISPConfig server record to database.'); |
|
449 | 484 |
|
450 | 485 | } |
451 | 486 |
|
| 487 | + /* |
452 | 488 | //** Configure Squid |
453 | 489 | if(strtolower($inst->simple_query('Configure Proxy Server', array('y','n'),'y') ) == 'y') { |
454 | 490 | if($conf['squid']['installed'] == true) { |
|
463 | 499 | 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'); |
464 | 500 | } |
465 | 501 | } |
| 502 | + */ |
466 | 503 |
|
467 | 504 | //** 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 | + } |
481 | 538 | } |
482 | 539 |
|
483 | 540 | //** Configure Firewall |
|
520 | 577 | */ |
521 | 578 |
|
522 | 579 | //** 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); |
524 | 584 |
|
525 | 585 | if(strtolower($inst->simple_query('Enable SSL for the ISPConfig web interface',array('y','n'),'y')) == 'y') { |
526 | 586 | $inst->make_ispconfig_ssl_cert(); |
|
541 | 601 | //* Configure ISPConfig |
542 | 602 | swriteln('Installing ISPConfig crontab'); |
543 | 603 | $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 | + } |
545 | 610 |
|
546 | 611 |
|
547 | 612 |
|
|
0 commit comments