Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
bba7b07c
Commit
bba7b07c
authored
Jul 13, 2017
by
Marius Burkard
Browse files
- fixed LE command order
parent
a35a0032
Changes
1
Hide whitespace changes
Inline
Side-by-side
server/lib/classes/letsencrypt.inc.php
View file @
bba7b07c
...
...
@@ -254,22 +254,11 @@ class letsencrypt {
$cli_domain_arg
.
=
(
string
)
" --domains "
.
$temp_domain
;
}
$le_files
=
$this
->
get_letsencrypt_certificate_paths
(
$temp_domains
);
// unset useless data
unset
(
$subdomains
);
unset
(
$aliasdomains
);
unset
(
$temp_domains
);
if
(
$server_type
!=
'apache'
||
version_compare
(
$app
->
system
->
getapacheversion
(
true
),
'2.4.8'
,
'>='
))
{
$crt_tmp_file
=
$le_files
[
'fullchain'
];
}
else
{
$crt_tmp_file
=
$le_files
[
'cert'
];
}
$key_tmp_file
=
$le_files
[
'privkey'
];
$bundle_tmp_file
=
$le_files
[
'chain'
];
$letsencrypt_cmd
=
''
;
$success
=
false
;
if
(
!
empty
(
$cli_domain_arg
))
{
...
...
@@ -284,6 +273,17 @@ class letsencrypt {
}
}
$le_files
=
$this
->
get_letsencrypt_certificate_paths
(
$temp_domains
);
if
(
$server_type
!=
'apache'
||
version_compare
(
$app
->
system
->
getapacheversion
(
true
),
'2.4.8'
,
'>='
))
{
$crt_tmp_file
=
$le_files
[
'fullchain'
];
}
else
{
$crt_tmp_file
=
$le_files
[
'cert'
];
}
$key_tmp_file
=
$le_files
[
'privkey'
];
$bundle_tmp_file
=
$le_files
[
'chain'
];
if
(
!
$success
)
{
// error issuing cert
$app
->
log
(
'Let\'s Encrypt SSL Cert for: '
.
$domain
.
' could not be issued.'
,
LOGLEVEL_WARN
);
...
...
Till Brehm
@tbrehm
·
Jul 13, 2017
Owner
Fixes
#4700 (closed)
Fixes #4700
AndyPL
@andrzejs
mentioned in issue
#4705 (closed)
·
Jul 14, 2017
mentioned in issue
#4705 (closed)
mentioned in issue #4705
Toggle commit list
AndyPL
@andrzejs
mentioned in issue
#4700 (closed)
·
Jul 14, 2017
mentioned in issue
#4700 (closed)
mentioned in issue #4700
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment