From 1392353a9f6fc200c418ceb3d57a22a2bacfb52d Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 15 Sep 2020 14:59:28 +0200
Subject: [PATCH] - move apps vhost behind cert generation
---
install/install.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/install/install.php b/install/install.php
index 496ab3fdce..294298653a 100644
--- a/install/install.php
+++ b/install/install.php
@@ -536,12 +536,6 @@ if($force) {
$inst->configure_fail2ban();
}
-if($conf['services']['web'] == true) {
- //** Configure apps vhost
- swriteln('Configuring Apps vhost');
- $inst->configure_apps_vhost();
-}
-
//** Configure ISPConfig :-)
$install_ispconfig_interface_default = ($conf['mysql']['master_slave_setup'] == 'y')?'n':'y';
if($install_mode == 'standard' || strtolower($inst->simple_query('Install ISPConfig Web Interface', array('y', 'n'), $install_ispconfig_interface_default,'install_ispconfig_web_interface')) == 'y') {
@@ -582,6 +576,12 @@ if(!file_exists('/usr/local/ispconfig/interface/ssl/ispserver.crt')) {
$inst->make_ispconfig_ssl_cert();
}
+if($conf['services']['web'] == true) {
+ //** Configure apps vhost
+ swriteln('Configuring Apps vhost');
+ $inst->configure_apps_vhost();
+}
+
$inst->install_ispconfig();
//* Configure DBServer
--
GitLab