yeswiki/yeswiki-installer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(yeswiki-installer) : no www. for subdomain certs

Browse source
This commit is contained in:
mrflos 2023-04-21 09:23:10 +03:00
parent 8d381200ca
commit 2dbc525925
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
utils.inc.php
View file

@ -195,6 +195,7 @@ function createNginxConfig($domain, $user, $herseUser, $hersePass, $nossl)
} }
$templates = new League\Plates\Engine(dirname(__FILE__).'/templates'); $templates = new League\Plates\Engine(dirname(__FILE__).'/templates');
$subDomain = preg_match('/.'.$_SERVER['maindomain'].'$/isU', $domain, $matches, PREG_OFFSET_CAPTURE, 0); $subDomain = preg_match('/.'.$_SERVER['maindomain'].'$/isU', $domain, $matches, PREG_OFFSET_CAPTURE, 0);
$isFullDomain = !preg_match('/^([a-zA-Z0-9]([-a-zA-Z0-9]{0,61}[a-zA-Z0-9])\.)([a-zA-Z0-9]{1,2}([-a-zA-Z0-9]{0,252}[a-zA-Z0-9])?)\.([a-zA-Z]{2,63})$/isU', $domain, $matches, PREG_OFFSET_CAPTURE, 0);
if (!$nossl) { if (!$nossl) {
if (!$subDomain) { if (!$subDomain) {
file_put_contents( file_put_contents(
@ -208,7 +209,11 @@ function createNginxConfig($domain, $user, $herseUser, $hersePass, $nossl)
) )
); );
exec('service nginx force-reload', $output); exec('service nginx force-reload', $output);
exec('/root/.acme.sh/acme.sh --issue -d '.$domain.' -d www.'.$domain.' -k ec-384 -w /home/'.$user.'/'.$domain.'/', $output); if ($isFullDomain) {
exec('/root/.acme.sh/acme.sh --issue -d '.$domain.' -d www.'.$domain.' -k ec-384 -w /home/'.$user.'/'.$domain.'/', $output);
} else {
exec('/root/.acme.sh/acme.sh --issue -d '.$domain.' -k ec-384 -w /home/'.$user.'/'.$domain.'/', $output);
}
exec('mkdir -p /etc/letsencrypt/live/'.$domain, $output); exec('mkdir -p /etc/letsencrypt/live/'.$domain, $output);
exec('/root/.acme.sh/acme.sh --install-cert -d '.$domain.' --ecc \ exec('/root/.acme.sh/acme.sh --install-cert -d '.$domain.' --ecc \
--cert-file /etc/letsencrypt/live/'.$domain.'/cert.pem \ --cert-file /etc/letsencrypt/live/'.$domain.'/cert.pem \