Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
ISPConfig 3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ISPConfig
ISPConfig 3
Commits
a7f17fc0
Verified
Commit
a7f17fc0
authored
4 years ago
by
JanThiel
Browse files
Options
Downloads
Patches
Plain Diff
Add --cert-name option to certbot calls to set primary domain instead of --expand
Fixes
ispconfig/ispconfig3#6061
parent
d0d54151
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1418
Add --cert-name option to certbot calls to set primary domain instead of --expand
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
server/lib/classes/letsencrypt.inc.php
+4
-1
4 additions, 1 deletion
server/lib/classes/letsencrypt.inc.php
with
4 additions
and
1 deletion
server/lib/classes/letsencrypt.inc.php
+
4
−
1
View file @
a7f17fc0
...
...
@@ -137,6 +137,7 @@ class letsencrypt {
return
false
;
}
$primary_domain
=
$domains
[
0
];
$matches
=
array
();
$ret
=
null
;
$val
=
0
;
...
...
@@ -158,11 +159,13 @@ class letsencrypt {
$webroot_map
[
$domains
[
$i
]]
=
'/usr/local/ispconfig/interface/acme'
;
}
$webroot_args
=
"--webroot-map "
.
escapeshellarg
(
str_replace
(
array
(
"
\r
"
,
"
\n
"
),
''
,
json_encode
(
$webroot_map
)));
$cert_selection_command
=
"--cert-name
$primary_domain
"
;
}
else
{
$webroot_args
=
"
$cmd
--webroot-path /usr/local/ispconfig/interface/acme"
;
$cert_selection_command
=
"--expand"
;
}
$cmd
=
$letsencrypt
.
" certonly -n --text --agree-tos
--exp
and --authenticator webroot --server
$acme_version
--rsa-key-size 4096 --email postmaster@
$domain
$webroot_args
"
;
$cmd
=
$letsencrypt
.
" certonly -n --text --agree-tos
$cert_selection_comm
and
--authenticator webroot --server
$acme_version
--rsa-key-size 4096 --email postmaster@
$
primary_
domain
$webroot_args
"
;
return
$cmd
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment