Commit 29d7a4ef authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'certificate_exists' into 'develop'

remove unneeded "certificate exists" message

Closes #5757

See merge request ispconfig/ispconfig3!1206
parents a8273bc3 c28faf16
Pipeline #5552 passed with stage
in 10 seconds
......@@ -545,6 +545,7 @@ if($conf['apache']['installed'] == true) {
}
//** Configure ISPConfig :-)
$issue_asked = false;
$issue_tried = false;
$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') {
......@@ -574,6 +575,7 @@ if($install_mode == 'standard' || strtolower($inst->simple_query('Install ISPCon
$inst->make_ispconfig_ssl_cert();
$issue_tried = true;
}
$issue_asked = true;
$inst->install_ispconfig_interface = true;
} else {
......@@ -581,12 +583,14 @@ if($install_mode == 'standard' || strtolower($inst->simple_query('Install ISPCon
}
// Create SSL certs for non-webserver(s)?
if(!file_exists('/usr/local/ispconfig/interface/ssl/ispserver.crt')) {
if(!$issue_tried && strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y','create_ssl_server_certs')) == 'y') {
$inst->make_ispconfig_ssl_cert();
}
} else {
swriteln('Certificate exists. Not creating a new one.');
if(!$issue_asked) {
if(!file_exists('/usr/local/ispconfig/interface/ssl/ispserver.crt')) {
if(!$issue_tried && strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y','create_ssl_server_certs')) == 'y') {
$inst->make_ispconfig_ssl_cert();
}
} else {
swriteln('Certificate exists. Not creating a new one.');
}
}
if($conf['services']['web'] == true) {
......
......@@ -519,6 +519,7 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
//** Configure ISPConfig
swriteln('Updating ISPConfig');
$issue_asked = false;
$issue_tried = false;
// create acme vhost
if($conf['nginx']['installed'] == true) {
......@@ -544,15 +545,18 @@ if ($inst->install_ispconfig_interface) {
$inst->make_ispconfig_ssl_cert();
$issue_tried = true;
}
$issue_asked = true;
}
// Create SSL certs for non-webserver(s)?
if(!file_exists('/usr/local/ispconfig/interface/ssl/ispserver.crt')) {
if(!$issue_tried && strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y','create_ssl_server_certs')) == 'y') {
$inst->make_ispconfig_ssl_cert();
}
} else {
swriteln('Certificate exists. Not creating a new one.');
if(!$issue_asked) {
if(!file_exists('/usr/local/ispconfig/interface/ssl/ispserver.crt')) {
if(!$issue_tried && strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y','create_ssl_server_certs')) == 'y') {
$inst->make_ispconfig_ssl_cert();
}
} else {
swriteln('Certificate exists. Not creating a new one.');
}
}
$inst->install_ispconfig();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment