maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

add missing setting-strings for new acme-version setting; allow using let's encrypt with wildcard-alias when using ACME-v2

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-01-09 14:56:41 +01:00
parent d40d1f30b6
commit b2b9d4e31a
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin_domains.php
View File

@@ -633,8 +633,8 @@ if ($page == 'domains' || $page == 'overview') {
$ocsp_stapling = 0;
}
// We can't enable let's encrypt for wildcard - domains
if ($serveraliasoption == '0' && $letsencrypt == '1') {
// We can't enable let's encrypt for wildcard - domains if using acme-v1
if ($serveraliasoption == '0' && $letsencrypt == '1' && Settings::Get('system.leapiversion') == '1') {
standard_error('nowildcardwithletsencrypt');
}
@@ -1511,8 +1511,8 @@ if ($page == 'domains' || $page == 'overview') {
$ocsp_stapling = 0;
}
// We can't enable let's encrypt for wildcard domains
if ($serveraliasoption == '0' && $letsencrypt == '1') {
// We can't enable let's encrypt for wildcard domains when using acme-v1
if ($serveraliasoption == '0' && $letsencrypt == '1' && Settings::Get('system.leapiversion') == '1') {
standard_error('nowildcardwithletsencrypt');
}