mirror of
https://github.com/serghey-rodin/vesta.git
synced 2025-08-19 13:01:51 -07:00
LE installation
This commit is contained in:
Serghey Rodin
parent
5096b36c17
commit
9bf86eaabd
2 changed files with 128 additions and 150 deletions
|
|
@ -35,8 +35,7 @@ $v_tpl = $data[$v_domain]['IP'];
|
||||||
$v_cgi = $data[$v_domain]['CGI'];
|
$v_cgi = $data[$v_domain]['CGI'];
|
||||||
$v_elog = $data[$v_domain]['ELOG'];
|
$v_elog = $data[$v_domain]['ELOG'];
|
||||||
$v_ssl = $data[$v_domain]['SSL'];
|
$v_ssl = $data[$v_domain]['SSL'];
|
||||||
$v_letsencrypt = $data[$v_domain]['LETSENCRYPT'];
|
if (!empty($v_ssl)) {
|
||||||
if ( $v_ssl == 'yes' && ($v_letsencrypt == 'no' || empty($v_letsencrypt))) {
|
|
||||||
exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var);
|
exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var);
|
||||||
$ssl_str = json_decode(implode('', $output), true);
|
$ssl_str = json_decode(implode('', $output), true);
|
||||||
unset($output);
|
unset($output);
|
||||||
|
|
@ -51,6 +50,8 @@ if ( $v_ssl == 'yes' && ($v_letsencrypt == 'no' || empty($v_letsencrypt))) {
|
||||||
$v_ssl_pub_key = $ssl_str[$v_domain]['PUB_KEY'];
|
$v_ssl_pub_key = $ssl_str[$v_domain]['PUB_KEY'];
|
||||||
$v_ssl_issuer = $ssl_str[$v_domain]['ISSUER'];
|
$v_ssl_issuer = $ssl_str[$v_domain]['ISSUER'];
|
||||||
}
|
}
|
||||||
|
$v_letsencrypt = $data[$v_domain]['LETSENCRYPT'];
|
||||||
|
if (empty($v_letsencrypt)) $v_letsencrypt = 'no';
|
||||||
$v_ssl_home = $data[$v_domain]['SSL_HOME'];
|
$v_ssl_home = $data[$v_domain]['SSL_HOME'];
|
||||||
$v_backend_template = $data[$v_domain]['BACKEND'];
|
$v_backend_template = $data[$v_domain]['BACKEND'];
|
||||||
$v_proxy = $data[$v_domain]['PROXY'];
|
$v_proxy = $data[$v_domain]['PROXY'];
|
||||||
|
|
@ -264,17 +265,18 @@ if (!empty($_POST['save'])) {
|
||||||
$restart_proxy = 'yes';
|
$restart_proxy = 'yes';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disable Lets Encrypt support
|
// Delete Lets Encrypt support
|
||||||
|
if (( $v_letsencrypt == 'yes' ) && (empty($_POST['v_letsencrypt'])) && (empty($_SESSION['error_msg']))) {
|
||||||
if (( $v_letsencrypt == 'yes' ) && (empty($_POST['v_letsencrypt'])) && (!empty($_POST['v_letsencrypt'])) && (empty($_SESSION['error_msg']))) {
|
exec (VESTA_CMD."v-delete-letsencrypt-domain ".$user." ".$v_domain." 'no'", $output, $return_var);
|
||||||
exec (VESTA_CMD."v-delete-letsencrypt-domain ".$user." ".$v_domain." '' 'no'", $output, $return_var);
|
|
||||||
check_return_code($return_var,$output);
|
check_return_code($return_var,$output);
|
||||||
unset($output);
|
unset($output);
|
||||||
$v_letsencrypt = 'no';
|
$v_letsencrypt = 'no';
|
||||||
|
$v_letsencrypt_deleted = 'yes';
|
||||||
|
$v_ssl = 'no';
|
||||||
$restart_web = 'yes';
|
$restart_web = 'yes';
|
||||||
$restart_proxy = 'yes';
|
$restart_proxy = 'yes';
|
||||||
}
|
}
|
||||||
else{
|
|
||||||
// Delete SSL certificate
|
// Delete SSL certificate
|
||||||
if (( $v_ssl == 'yes' ) && (empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
|
if (( $v_ssl == 'yes' ) && (empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
|
||||||
exec (VESTA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var);
|
exec (VESTA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var);
|
||||||
|
|
@ -284,92 +286,24 @@ if (!empty($_POST['save'])) {
|
||||||
$restart_web = 'yes';
|
$restart_web = 'yes';
|
||||||
$restart_proxy = 'yes';
|
$restart_proxy = 'yes';
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Enable Lets Encrypt support
|
// Add Lets Encrypt support
|
||||||
if (( $v_letsencrypt == 'no' || empty( $v_letsencrypt)) && (!empty($_POST['v_letsencrypt'])) && empty($_SESSION['error_msg'])) {
|
if ((!empty($_POST['v_ssl'])) && ( $v_letsencrypt == 'no' ) && (!empty($_POST['v_letsencrypt'])) && empty($_SESSION['error_msg'])) {
|
||||||
exec (VESTA_CMD."v-list-web-domain ".$user." ".$v_domain." json", $output, $return_var);
|
$l_aliases = str_replace("\n", ',', $v_aliases);
|
||||||
$data = json_decode(implode('', $output), true);
|
exec (VESTA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '".$l_aliases."' 'no'", $output, $return_var);
|
||||||
exec (VESTA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '' 'no'", $output, $return_var);
|
|
||||||
check_return_code($return_var,$output);
|
check_return_code($return_var,$output);
|
||||||
unset($output);
|
unset($output);
|
||||||
$v_letsencrypt = 'yes';
|
$v_letsencrypt = 'yes';
|
||||||
|
$v_ssl = 'yes';
|
||||||
$restart_web = 'yes';
|
$restart_web = 'yes';
|
||||||
$restart_proxy = 'yes';
|
$restart_proxy = 'yes';
|
||||||
}
|
}
|
||||||
else{
|
|
||||||
// Change SSL certificate
|
|
||||||
if (($v_ssl == 'yes') && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
|
|
||||||
if (( $v_ssl_crt != str_replace("\r\n", "\n", $_POST['v_ssl_crt'])) || ( $v_ssl_key != str_replace("\r\n", "\n", $_POST['v_ssl_key'])) || ( $v_ssl_ca != str_replace("\r\n", "\n", $_POST['v_ssl_ca']))) {
|
|
||||||
exec ('mktemp -d', $mktemp_output, $return_var);
|
|
||||||
$tmpdir = $mktemp_output[0];
|
|
||||||
|
|
||||||
// Certificate
|
|
||||||
if (!empty($_POST['v_ssl_crt'])) {
|
|
||||||
$fp = fopen($tmpdir."/".$_POST['v_domain'].".crt", 'w');
|
|
||||||
fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_crt']));
|
|
||||||
fwrite($fp, "\n");
|
|
||||||
fclose($fp);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Key
|
|
||||||
if (!empty($_POST['v_ssl_key'])) {
|
|
||||||
$fp = fopen($tmpdir."/".$_POST['v_domain'].".key", 'w');
|
|
||||||
fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_key']));
|
|
||||||
fwrite($fp, "\n");
|
|
||||||
fclose($fp);
|
|
||||||
}
|
|
||||||
|
|
||||||
// CA
|
|
||||||
if (!empty($_POST['v_ssl_ca'])) {
|
|
||||||
$fp = fopen($tmpdir."/".$_POST['v_domain'].".ca", 'w');
|
|
||||||
fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_ca']));
|
|
||||||
fwrite($fp, "\n");
|
|
||||||
fclose($fp);
|
|
||||||
}
|
|
||||||
|
|
||||||
exec (VESTA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var);
|
|
||||||
check_return_code($return_var,$output);
|
|
||||||
unset($output);
|
|
||||||
$restart_web = 'yes';
|
|
||||||
$restart_proxy = 'yes';
|
|
||||||
|
|
||||||
exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var);
|
|
||||||
$ssl_str = json_decode(implode('', $output), true);
|
|
||||||
unset($output);
|
|
||||||
$v_ssl_crt = $ssl_str[$v_domain]['CRT'];
|
|
||||||
$v_ssl_key = $ssl_str[$v_domain]['KEY'];
|
|
||||||
$v_ssl_ca = $ssl_str[$v_domain]['CA'];
|
|
||||||
$v_ssl_subject = $ssl_str[$v_domain]['SUBJECT'];
|
|
||||||
$v_ssl_aliases = $ssl_str[$v_domain]['ALIASES'];
|
|
||||||
$v_ssl_not_before = $ssl_str[$v_domain]['NOT_BEFORE'];
|
|
||||||
$v_ssl_not_after = $ssl_str[$v_domain]['NOT_AFTER'];
|
|
||||||
$v_ssl_signature = $ssl_str[$v_domain]['SIGNATURE'];
|
|
||||||
$v_ssl_pub_key = $ssl_str[$v_domain]['PUB_KEY'];
|
|
||||||
$v_ssl_issuer = $ssl_str[$v_domain]['ISSUER'];
|
|
||||||
|
|
||||||
// Cleanup certificate tempfiles
|
|
||||||
if (!empty($_POST['v_ssl_crt'])) {
|
|
||||||
unlink($tmpdir."/".$_POST['v_domain'].".crt");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($_POST['v_ssl_key'])) {
|
|
||||||
unlink($tmpdir."/".$_POST['v_domain'].".key");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($_POST['v_ssl_ca'])) {
|
|
||||||
unlink($tmpdir."/".$_POST['v_domain'].".ca");
|
|
||||||
}
|
|
||||||
|
|
||||||
rmdir($tmpdir);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add SSL certificate
|
// Add SSL certificate
|
||||||
if (( $v_ssl == 'no') && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
|
if (( $v_ssl == 'no' ) && (!empty($_POST['v_ssl'])) && (empty($v_letsencrypt_deleted)) && (empty($_SESSION['error_msg']))) {
|
||||||
if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_crt']))) $errors[] = 'ssl certificate';
|
if (empty($_POST['v_ssl_crt'])) $errors[] = 'ssl certificate';
|
||||||
if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_key']))) $errors[] = 'ssl key';
|
if (empty($_POST['v_ssl_key'])) $errors[] = 'ssl key';
|
||||||
if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_home']))) $errors[] = 'ssl home';
|
if (empty($_POST['v_ssl_home'])) $errors[] = 'ssl home';
|
||||||
$v_ssl_home = escapeshellarg($_POST['v_ssl_home']);
|
$v_ssl_home = escapeshellarg($_POST['v_ssl_home']);
|
||||||
if (!empty($errors[0])) {
|
if (!empty($errors[0])) {
|
||||||
foreach ($errors as $i => $error) {
|
foreach ($errors as $i => $error) {
|
||||||
|
|
@ -426,22 +360,71 @@ if (!empty($_POST['save'])) {
|
||||||
$v_ssl_issuer = $ssl_str[$v_domain]['ISSUER'];
|
$v_ssl_issuer = $ssl_str[$v_domain]['ISSUER'];
|
||||||
|
|
||||||
// Cleanup certificate tempfiles
|
// Cleanup certificate tempfiles
|
||||||
if (!empty($_POST['v_ssl_crt'])) {
|
if (!empty($_POST['v_ssl_crt'])) unlink($tmpdir."/".$_POST['v_domain'].".crt");
|
||||||
unlink($tmpdir."/".$_POST['v_domain'].".crt");
|
if (!empty($_POST['v_ssl_key'])) unlink($tmpdir."/".$_POST['v_domain'].".key");
|
||||||
}
|
if (!empty($_POST['v_ssl_ca'])) unlink($tmpdir."/".$_POST['v_domain'].".ca");
|
||||||
|
|
||||||
if (!empty($_POST['v_ssl_key'])) {
|
|
||||||
unlink($tmpdir."/".$_POST['v_domain'].".key");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($_POST['v_ssl_ca'])) {
|
|
||||||
unlink($tmpdir."/".$_POST['v_domain'].".ca");
|
|
||||||
}
|
|
||||||
|
|
||||||
rmdir($tmpdir);
|
rmdir($tmpdir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Change SSL certificate
|
||||||
|
if (( $v_letsencrypt == 'no' ) && ( $v_ssl == 'yes' ) && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
|
||||||
|
if (( $v_ssl_crt != str_replace("\r\n", "\n", $_POST['v_ssl_crt'])) || ( $v_ssl_key != str_replace("\r\n", "\n", $_POST['v_ssl_key'])) || ( $v_ssl_ca != str_replace("\r\n", "\n", $_POST['v_ssl_ca']))) {
|
||||||
|
exec ('mktemp -d', $mktemp_output, $return_var);
|
||||||
|
$tmpdir = $mktemp_output[0];
|
||||||
|
|
||||||
|
// Certificate
|
||||||
|
if (!empty($_POST['v_ssl_crt'])) {
|
||||||
|
$fp = fopen($tmpdir."/".$_POST['v_domain'].".crt", 'w');
|
||||||
|
fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_crt']));
|
||||||
|
fwrite($fp, "\n");
|
||||||
|
fclose($fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Key
|
||||||
|
if (!empty($_POST['v_ssl_key'])) {
|
||||||
|
$fp = fopen($tmpdir."/".$_POST['v_domain'].".key", 'w');
|
||||||
|
fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_key']));
|
||||||
|
fwrite($fp, "\n");
|
||||||
|
fclose($fp);
|
||||||
|
}
|
||||||
|
|
||||||
|
// CA
|
||||||
|
if (!empty($_POST['v_ssl_ca'])) {
|
||||||
|
$fp = fopen($tmpdir."/".$_POST['v_domain'].".ca", 'w');
|
||||||
|
fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_ca']));
|
||||||
|
fwrite($fp, "\n");
|
||||||
|
fclose($fp);
|
||||||
|
}
|
||||||
|
|
||||||
|
exec (VESTA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var);
|
||||||
|
check_return_code($return_var,$output);
|
||||||
|
unset($output);
|
||||||
|
$restart_web = 'yes';
|
||||||
|
$restart_proxy = 'yes';
|
||||||
|
|
||||||
|
exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var);
|
||||||
|
$ssl_str = json_decode(implode('', $output), true);
|
||||||
|
unset($output);
|
||||||
|
$v_ssl_crt = $ssl_str[$v_domain]['CRT'];
|
||||||
|
$v_ssl_key = $ssl_str[$v_domain]['KEY'];
|
||||||
|
$v_ssl_ca = $ssl_str[$v_domain]['CA'];
|
||||||
|
$v_ssl_subject = $ssl_str[$v_domain]['SUBJECT'];
|
||||||
|
$v_ssl_aliases = $ssl_str[$v_domain]['ALIASES'];
|
||||||
|
$v_ssl_not_before = $ssl_str[$v_domain]['NOT_BEFORE'];
|
||||||
|
$v_ssl_not_after = $ssl_str[$v_domain]['NOT_AFTER'];
|
||||||
|
$v_ssl_signature = $ssl_str[$v_domain]['SIGNATURE'];
|
||||||
|
$v_ssl_pub_key = $ssl_str[$v_domain]['PUB_KEY'];
|
||||||
|
$v_ssl_issuer = $ssl_str[$v_domain]['ISSUER'];
|
||||||
|
|
||||||
|
// Cleanup certificate tempfiles
|
||||||
|
if (!empty($_POST['v_ssl_crt'])) unlink($tmpdir."/".$_POST['v_domain'].".crt");
|
||||||
|
if (!empty($_POST['v_ssl_key'])) unlink($tmpdir."/".$_POST['v_domain'].".key");
|
||||||
|
if (!empty($_POST['v_ssl_ca'])) unlink($tmpdir."/".$_POST['v_domain'].".ca");
|
||||||
|
rmdir($tmpdir);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Change document root for ssl domain
|
// Change document root for ssl domain
|
||||||
if (( $v_ssl == 'yes') && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
|
if (( $v_ssl == 'yes') && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) {
|
||||||
if ( $v_ssl_home != $_POST['v_ssl_home'] ) {
|
if ( $v_ssl_home != $_POST['v_ssl_home'] ) {
|
||||||
|
|
|
||||||
|
|
@ -188,12 +188,7 @@
|
||||||
<table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
|
<table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="input-label vst-text">
|
<td class="input-label vst-text">
|
||||||
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" <?php if($v_letencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_letsencrypt(this)"> <?php print __('Lets Encrypt Support');?></label>
|
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_letsencrypt(this)"> <?php print __('Lets Encrypt Support');?></label>
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="vst-text input-label lets-encrypt-note <? if($v_letencrypt == 'yes' || $v_letencrypt == 'on') echo ' enabled';?>" >
|
|
||||||
<?= __('Your certificate will be automatically issued in 5 minutes')?>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -337,7 +332,7 @@
|
||||||
</select>
|
</select>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="stats-auth" style="<? if ($v_stats == 'none') { ?>display:none"<? } ?>>
|
<tr class="stats-auth" style="<? if ($v_stats == 'none') { ?>display:none<? } ?>">
|
||||||
<td class="vst-text input-label step-left">
|
<td class="vst-text input-label step-left">
|
||||||
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');"><?php print __('Statistics Authorization');?></label>
|
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');"><?php print __('Statistics Authorization');?></label>
|
||||||
</td>
|
</td>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue