Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mailinabox
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
mailinabox
Commits
ef6f1214
Commit
ef6f1214
authored
Jan 28, 2018
by
Joshua Tauberer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
when generating a CSR in the control panel, don't set empty attributes
Same as in
a52c56e5
. Fixes #1338.
parent
ec3aab0e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
CHANGELOG.md
CHANGELOG.md
+7
-0
ssl_certificates.py
management/ssl_certificates.py
+1
-1
No files found.
CHANGELOG.md
View file @
ef6f1214
CHANGELOG
CHANGELOG
=========
=========
In Development
--------------
Control Panel:
*
Installing your own TLS/SSL certificate had been broken since v0.24 because the new version of openssl became stricter about CSR generation parameters.
v0.26b (January 25, 2018)
v0.26b (January 25, 2018)
-------------------------
-------------------------
...
...
management/ssl_certificates.py
View file @
ef6f1214
...
@@ -556,7 +556,7 @@ def create_csr(domain, ssl_key, country_code, env):
...
@@ -556,7 +556,7 @@ def create_csr(domain, ssl_key, country_code, env):
"openssl"
,
"req"
,
"-new"
,
"openssl"
,
"req"
,
"-new"
,
"-key"
,
ssl_key
,
"-key"
,
ssl_key
,
"-sha256"
,
"-sha256"
,
"-subj"
,
"/C=
%
s/
ST=/L=/O=/
CN=
%
s"
%
(
country_code
,
domain
)])
"-subj"
,
"/C=
%
s/CN=
%
s"
%
(
country_code
,
domain
)])
def
install_cert
(
domain
,
ssl_cert
,
ssl_chain
,
env
,
raw
=
False
):
def
install_cert
(
domain
,
ssl_cert
,
ssl_chain
,
env
,
raw
=
False
):
# Write the combined cert+chain to a temporary path and validate that it is OK.
# Write the combined cert+chain to a temporary path and validate that it is OK.
...
...
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