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

output error message when letsencrypt is checked and wildcard-serveralias in enabled - not just silently disable letsencrypt, people don't read the description and are confused

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-02-16 08:51:36 +01:00
parent 29a2c78b3f
commit 5109443346
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin_domains.php
View File

@@ -585,8 +585,8 @@ if ($page == 'domains'
}
// We can't enable let's encrypt for wildcard - domains
if ($serveraliasoption == '0') {
$letsencrypt = 0;
if ($serveraliasoption == '0' && $letsencrypt == '1') {
standard_error('nowildcardwithletsencrypt');
}
if (!preg_match('/^https?\:\/\//', $documentroot)) {
@@ -1372,8 +1372,8 @@ if ($page == 'domains'
}
// We can't enable let's encrypt for wildcard domains
if ($serveraliasoption == '0') {
$letsencrypt = '0';
if ($serveraliasoption == '0' && $letsencrypt == '1') {
standard_error('nowildcardwithletsencrypt');
}
if (!preg_match('/^https?\:\/\//', $documentroot)) {