From 497951c2b61df77864e5c4ad663354f31e4ae588 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Mon, 6 Jul 2020 15:48:07 +0200
Subject: [PATCH] _keyring_ -> _keystore_

---
 templates/orientdb-letsencrypt-acme.sh.j2 | 16 ++++++++--------
 templates/orientdb-server-config.xml.j2   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/templates/orientdb-letsencrypt-acme.sh.j2 b/templates/orientdb-letsencrypt-acme.sh.j2
index 4a954c1..abec2a8 100644
--- a/templates/orientdb-letsencrypt-acme.sh.j2
+++ b/templates/orientdb-letsencrypt-acme.sh.j2
@@ -4,29 +4,29 @@ ORIENTDB_ENABLED="{{ orientdb_enabled }}"
 RETVAL=0
 
 # Add the CA certificate if it's not already present
-keytool -list -keystore {{ java_keyring_file }} -storepass {{ java_keyring_pwd }} -noprompt | grep {{ java_keyring_letsencrypt_trusted_ca }}
+keytool -list -keystore {{ java_keystore_file }} -storepass {{ java_keystore_pwd }} -noprompt | grep {{ java_keystore_letsencrypt_trusted_ca }}
 RETVAL=$?
 
 if [ $RETVAL -ne 0 ] ; then
-    keytool -trustcacerts -keystore "{{ java_keyring_file }}" -storepass {{ java_keyring_pwd }} -noprompt -importcert -alias "{{ java_keyring_letsencrypt_trusted_ca }}" -dname "CN={{ ansible_fqdn }}" -file "{{ letsencrypt_acme_certs_dir }}/fullchain"
+    keytool -trustcacerts -keystore "{{ java_keystore_file }}" -storepass {{ java_keystore_pwd }} -noprompt -importcert -alias "{{ java_keystore_letsencrypt_trusted_ca }}" -dname "CN={{ ansible_fqdn }}" -file "{{ letsencrypt_acme_certs_dir }}/fullchain"
 fi
 # Remove the old certificate
-keytool -storepass {{ java_keyring_pwd }} -keystore "{{ java_keyring_file }}" -delete -alias "{{ ansible_fqdn }}"
+keytool -storepass {{ java_keystore_pwd }} -keystore "{{ java_keystore_file }}" -delete -alias "{{ ansible_fqdn }}"
 
 # Check if the old certificate is still present. If so, we have a problem. Otherwise, import the new one
-keytool -list -keystore {{ java_keyring_file }} -storepass {{ java_keyring_pwd }} -noprompt | grep {{ ansible_fqdn }}
+keytool -list -keystore {{ java_keystore_file }} -storepass {{ java_keystore_pwd }} -noprompt | grep {{ ansible_fqdn }}
 RETVAL=$?
 if [ $RETVAL -ne 0 ] ; then
-    openssl pkcs12 -export -in {{ letsencrypt_acme_certs_dir }}/cert -inkey {{ letsencrypt_acme_certs_dir }}/privkey -CAfile {{ letsencrypt_acme_certs_dir }}/fullchain -name "{{ ansible_fqdn }}" -out /var/tmp/{{ ansible_fqdn }}.p12 -password pass:{{ java_keyring_pwd }}
-    keytool -importkeystore -srcstorepass {{ java_keyring_pwd }} -deststorepass {{ java_keyring_pwd }} -destkeystore {{ java_keyring_file }} -srckeystore /var/tmp/{{ ansible_fqdn }}.p12 -srcstoretype PKCS12
+    openssl pkcs12 -export -in {{ letsencrypt_acme_certs_dir }}/cert -inkey {{ letsencrypt_acme_certs_dir }}/privkey -CAfile {{ letsencrypt_acme_certs_dir }}/fullchain -name "{{ ansible_fqdn }}" -out /var/tmp/{{ ansible_fqdn }}.p12 -password pass:{{ java_keystore_pwd }}
+    keytool -importkeystore -srcstorepass {{ java_keystore_pwd }} -deststorepass {{ java_keystore_pwd }} -destkeystore {{ java_keystore_file }} -srckeystore /var/tmp/{{ ansible_fqdn }}.p12 -srcstoretype PKCS12
     rm -f /var/tmp/{{ ansible_fqdn }}.p12
 else
     logger "orientdb letsencrypt hook: the old certificate is still present inside the keystore, aborting."
     exit 1
 fi
 
-chmod 440 "{{ java_keyring_file }}"
-chgrp {{ orientdb_user }} "{{ java_keyring_file }}"
+chmod 440 "{{ java_keystore_file }}"
+chgrp {{ orientdb_user }} "{{ java_keystore_file }}"
 
 if [ "$ORIENTDB_ENABLED" == "True" ] ; then
     logger "orientdb letsencrypt hook: shut down orientdb."
diff --git a/templates/orientdb-server-config.xml.j2 b/templates/orientdb-server-config.xml.j2
index 279ae38..a401e02 100644
--- a/templates/orientdb-server-config.xml.j2
+++ b/templates/orientdb-server-config.xml.j2
@@ -50,10 +50,10 @@
 {% else %}
                     <parameter value="false" name="network.ssl.clientAuth"/>
 {% endif %}
-                    <parameter value="{{ java_keyring_file }}" name="network.ssl.keyStore"/>
-                    <parameter value="{{ java_keyring_pwd }}" name="network.ssl.keyStorePassword"/>
-                    <parameter value="{{ java_keyring_file }}" name="network.ssl.trustStore"/>
-                    <parameter value="{{ java_keyring_pwd }}" name="network.ssl.trustStorePassword"/>
+                    <parameter value="{{ java_keystore_file }}" name="network.ssl.keyStore"/>
+                    <parameter value="{{ java_keystore_pwd }}" name="network.ssl.keyStorePassword"/>
+                    <parameter value="{{ java_keystore_file }}" name="network.ssl.trustStore"/>
+                    <parameter value="{{ java_keystore_pwd }}" name="network.ssl.trustStorePassword"/>
                 </parameters>
             </socket>
             <socket implementation="com.orientechnologies.orient.server.network.OServerTLSSocketFactory" name="https">
@@ -63,10 +63,10 @@
 {% else %}
                     <parameter value="false" name="network.ssl.clientAuth"/>
 {% endif %}
-                    <parameter value="{{ java_keyring_file }}" name="network.ssl.keyStore"/>
-                    <parameter value="{{ java_keyring_pwd }}" name="network.ssl.keyStorePassword"/>
-                    <parameter value="{{ java_keyring_file }}" name="network.ssl.trustStore"/>
-                    <parameter value="{{ java_keyring_pwd }}" name="network.ssl.trustStorePassword"/>
+                    <parameter value="{{ java_keystore_file }}" name="network.ssl.keyStore"/>
+                    <parameter value="{{ java_keystore_pwd }}" name="network.ssl.keyStorePassword"/>
+                    <parameter value="{{ java_keystore_file }}" name="network.ssl.trustStore"/>
+                    <parameter value="{{ java_keystore_pwd }}" name="network.ssl.trustStorePassword"/>
                 </parameters>
             </socket>
         </sockets>