From 264f813ac357b95f5ffbfbe60c4c124173b784d2 Mon Sep 17 00:00:00 2001
From: Geert Josten <geert.josten@marklogic.com>
Date: Mon, 23 Feb 2015 20:29:19 +0100
Subject: [PATCH] Fixed #355: added missing certificates wrapper in sample
 config

---
 deploy/sample/build.sample.properties |  3 ++-
 deploy/sample/ml-config.sample.xml    | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/deploy/sample/build.sample.properties b/deploy/sample/build.sample.properties
index e3860ffa..779fd562 100644
--- a/deploy/sample/build.sample.properties
+++ b/deploy/sample/build.sample.properties
@@ -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
diff --git a/deploy/sample/ml-config.sample.xml b/deploy/sample/ml-config.sample.xml
index e48fda74..5f2168a3 100644
--- a/deploy/sample/ml-config.sample.xml
+++ b/deploy/sample/ml-config.sample.xml
@@ -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>