Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISPConfig
ISPConfig 3
Commits
775ed6c6
Commit
775ed6c6
authored
Jun 23, 2016
by
Till Brehm
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
parents
2be1de4e
312ab0fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
server/plugins-available/apache2_plugin.inc.php
server/plugins-available/apache2_plugin.inc.php
+2
-1
server/plugins-available/nginx_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php
+2
-1
No files found.
server/plugins-available/apache2_plugin.inc.php
View file @
775ed6c6
...
...
@@ -1236,7 +1236,8 @@ class apache2_plugin {
$app
->
log
(
"Create Let's Encrypt SSL Cert for:
$domain
"
,
LOGLEVEL_DEBUG
);
$success
=
false
;
$letsencrypt
=
array_shift
(
explode
(
"
\n
"
,
shell_exec
(
'which letsencrypt certbot /root/.local/share/letsencrypt/bin/letsencrypt'
))
);
$letsencrypt
=
explode
(
"
\n
"
,
shell_exec
(
'which letsencrypt certbot /root/.local/share/letsencrypt/bin/letsencrypt'
));
$letsencrypt
=
reset
(
$letsencrypt
);
if
(
is_executable
(
$letsencrypt
))
{
$success
=
$this
->
_exec
(
$letsencrypt
.
" certonly -n --text --agree-tos --expand --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@
$domain
--domains
$lddomain
--webroot-path /usr/local/ispconfig/interface/acme"
);
}
...
...
server/plugins-available/nginx_plugin.inc.php
View file @
775ed6c6
...
...
@@ -1315,7 +1315,8 @@ class nginx_plugin {
$app
->
log
(
"Create Let's Encrypt SSL Cert for:
$domain
"
,
LOGLEVEL_DEBUG
);
$success
=
false
;
$letsencrypt
=
array_shift
(
explode
(
"
\n
"
,
shell_exec
(
'which letsencrypt certbot /root/.local/share/letsencrypt/bin/letsencrypt'
))
);
$letsencrypt
=
explode
(
"
\n
"
,
shell_exec
(
'which letsencrypt certbot /root/.local/share/letsencrypt/bin/letsencrypt'
));
$letsencrypt
=
reset
(
$letsencrypt
);
if
(
is_executable
(
$letsencrypt
))
{
$success
=
$this
->
_exec
(
$letsencrypt
.
" certonly -n --text --agree-tos --expand --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@
$domain
--domains
$lddomain
--webroot-path /usr/local/ispconfig/interface/acme"
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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