Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Fixed #355: added missing certificates wrapper in sample config #388

Merged
merged 1 commit into from
Mar 10, 2015
Merged

Fixed #355: added missing certificates wrapper in sample config #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion deploy/sample/build.sample.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ appuser-password=random
# To make your http appserver use TLS/SSL, uncomment the ssl-certificate-template
# here and uncomment the ssl-certificate-template element in ml-config.xml.
#
# To create a template, uncomment at least ssl-certificate-template and ssl-certificate-oranizationName
# To create a template, uncomment at least ssl-certificate-template,
# ssl-certificate-countryName, and ssl-certificate-oranizationName
# ssl-certificate-template=roxy
# ssl-certificate-countryName=US
# ssl-certificate-stateOrProvinceName=LA
Expand Down
20 changes: 11 additions & 9 deletions deploy/sample/ml-config.sample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,15 +424,17 @@
@ml.triggers-db-xml
@ml.schemas-db-xml
</databases>
<certificate xmlns="http://marklogic.com/xdmp/pki">
<name>@ml.ssl-certificate-template</name>
<countryName>@ml.ssl-certificate-countryName</countryName>
<stateOrProvinceName>@ml.ssl-certificate-stateOrProvinceName</stateOrProvinceName>
<localityName>@ml.ssl-certificate-localityName</localityName>
<organizationName>@ml.ssl-certificate-organizationName</organizationName>
<organizationalUnitName>@ml.ssl-certificate-organizationalUnitName</organizationalUnitName>
<emailAddress>@ml.ssl-certificate-emailAddress</emailAddress>
</certificate>
<certificates xmlns="http://marklogic.com/xdmp/pki">
<certificate>
<name>@ml.ssl-certificate-template</name>
<countryName>@ml.ssl-certificate-countryName</countryName>
<stateOrProvinceName>@ml.ssl-certificate-stateOrProvinceName</stateOrProvinceName>
<localityName>@ml.ssl-certificate-localityName</localityName>
<organizationName>@ml.ssl-certificate-organizationName</organizationName>
<organizationalUnitName>@ml.ssl-certificate-organizationalUnitName</organizationalUnitName>
<emailAddress>@ml.ssl-certificate-emailAddress</emailAddress>
</certificate>
</certificates>
<roles xmlns="http://marklogic.com/xdmp/security">
<role>
<role-name>@ml.app-role</role-name>
Expand Down