ELCCR-1565 Documentation for SSL certificate change

Change-Id: I0de5bd0bded7d59dc8b86bb79a9ef6668069bd1a
Signed-off-by: Remus Turea <Remus.Turea@enea.com>

2 files changed, 28 insertions, 11 deletions

diff --git a/doc/book-enea-edge-getting-started/doc/installation_guide.xml b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
index 940fc40..a60c986 100644
--- a/doc/book-enea-edge-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
@@ -612,7 +612,24 @@ Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programli
                 <note>
                   <para>The generation of the Tomcat self-signed certificate
                   should be skipped only if another certificate will be
-                  provided.</para>
+                  provided. In case a custom certificate is used, not generated with the
+                  <literal>createCertificate.sh</literal> script, the keystore file
+                  containing the certificate must be manually copied
+                  to the <literal>
+                  /opt/ems/ucpemanager/application/config/certificates</literal> folder, 
+                    after the installation is done. The application must then be 
+                    restarted in order for the certificate to take effect. The default 
+                    name of the file is <filename>.Keystore</filename>.</para>
+
+                  <para>To change the default name, the configuration file
+                  <filename>server.xml</filename> from the 
+                    <literal>/opt/ems/ucpemanager/application/3rdParty/apache-tomcat/conf/config</literal>
+                  folder must be copied to <literal>/opt/ems/ucpemanager/application/config/</literal>. 
+                    The <literal>keystoreFile</literal> attribute from the <literal>&lt;Connector
+                  executor="tomcatThreadPool"</literal> tag must also be changed. Similarly, 
+                    if a password has been set, it should be added to the 
+                    <literal>keystorePass</literal> attribute: 
+                    <literal>keystorePass="NEW_PASSWORD"</literal>.</para>
                 </note>
               </listitem>
 
@@ -755,9 +772,9 @@ sdb       8:0    0    111.8G  0   disk
 of=/dev/sdb bs=4M conv=fsync</programlisting>
 
           <para>Where
-          <filename>enea-edge-runtime-&lt;processor&gt;.hddimg</filename> is the
-          <filename>.hddimg</filename> file and <literal>sdb</literal> is the
-          assigned USB device name.</para>
+          <filename>enea-edge-runtime-&lt;processor&gt;.hddimg</filename> is
+          the <filename>.hddimg</filename> file and <literal>sdb</literal> is
+          the assigned USB device name.</para>
         </listitem>
       </orderedlist>
     </section>
@@ -935,9 +952,9 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
             <listitem>
               <para>Plug in additional WAN interfaces (if applicable) and
               provide their Layer 3 configuration. An interface can be
-                configured in <literal>dhcp</literal> or 
-                <literal>static</literal> mode. When configured in static
-              mode, the following options are available:</para>
+              configured in <literal>dhcp</literal> or
+              <literal>static</literal> mode. When configured in static mode,
+              the following options are available:</para>
 
               <itemizedlist spacing="compact">
                 <listitem>
@@ -954,8 +971,8 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
 
                 <listitem>
                   <para>DNS Server List (a comma separated list of IPv4
-                  addresses) (optional). If left empty it will use the
-                  Gateway as the DNS, with 1.1.1.1 as fallback.</para>
+                  addresses) (optional). If left empty it will use the Gateway
+                  as the DNS, with 1.1.1.1 as fallback.</para>
                 </listitem>
               </itemizedlist>
             </listitem>
@@ -1275,4 +1292,4 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       </note>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml b/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml
index 08e3e0d..99170d9 100644
--- a/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml
+++ b/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml
@@ -127,7 +127,7 @@
       <para><remark>ELCCR-1565</remark>Before starting an Enea Edge Management
       upgrade, any owned Tomcat certificates should be manually copied into
       the
-      <literal>/opt/ems/ucpemanager/application/3rdParty/apache-tomcat/conf/certificates</literal>
+      <literal>/opt/ems/ucpemanager/application/config/certificates</literal>
       folder.</para>
     </listitem>