From de149b70ea35bbb0d2390f027d8a4c509d75027a Mon Sep 17 00:00:00 2001
From: Mathieu Leguay <mathieu.leguay@teamdlab.com>
Date: Sat, 25 Apr 2020 12:00:57 +0200
Subject: [PATCH] [DEVOPS] Add README and update cleanup method for
certificates
---
deployment/environments/certs/client-external/ca/README | 1 +
.../certs/client-external/clients/external/README | 1 +
deployment/environments/certs/client-vitam/ca/README | 1 +
deployment/environments/certs/client-vitam/clients/README | 1 +
deployment/pki/scripts/generate_certs.sh | 5 ++++-
5 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 deployment/environments/certs/client-external/ca/README
create mode 100644 deployment/environments/certs/client-external/clients/external/README
create mode 100644 deployment/environments/certs/client-vitam/ca/README
create mode 100644 deployment/environments/certs/client-vitam/clients/README
diff --git a/deployment/environments/certs/client-external/ca/README b/deployment/environments/certs/client-external/ca/README
new file mode 100644
index 00000000..aea8d0c6
--- /dev/null
+++ b/deployment/environments/certs/client-external/ca/README
@@ -0,0 +1 @@
+Put your external clients certificates' CA here (.crt)
\ No newline at end of file
diff --git a/deployment/environments/certs/client-external/clients/external/README b/deployment/environments/certs/client-external/clients/external/README
new file mode 100644
index 00000000..76fbc5ce
--- /dev/null
+++ b/deployment/environments/certs/client-external/clients/external/README
@@ -0,0 +1 @@
+Put your external client public certificates here (.crt)
\ No newline at end of file
diff --git a/deployment/environments/certs/client-vitam/ca/README b/deployment/environments/certs/client-vitam/ca/README
new file mode 100644
index 00000000..ac249a87
--- /dev/null
+++ b/deployment/environments/certs/client-vitam/ca/README
@@ -0,0 +1 @@
+Put your Vitam certificates' CA here (.crt)
\ No newline at end of file
diff --git a/deployment/environments/certs/client-vitam/clients/README b/deployment/environments/certs/client-vitam/clients/README
new file mode 100644
index 00000000..7add3b44
--- /dev/null
+++ b/deployment/environments/certs/client-vitam/clients/README
@@ -0,0 +1 @@
+Put your Vitam certificates here (.crt)
\ No newline at end of file
diff --git a/deployment/pki/scripts/generate_certs.sh b/deployment/pki/scripts/generate_certs.sh
index a5981901..ed422bb4 100755
--- a/deployment/pki/scripts/generate_certs.sh
+++ b/deployment/pki/scripts/generate_certs.sh
@@ -278,7 +278,10 @@ initVault certs ${ERASE}
if [ "${ERASE}" == "true" ]; then
if [ -d ${REPERTOIRE_CERTIFICAT} ]; then
# We remove all generated certs
- find "${REPERTOIRE_CERTIFICAT}/" -mindepth 1 -maxdepth 1 -type d -exec rm -Rf {} \;
+ find ${REPERTOIRE_CERTIFICAT} -type f -name *.crt -exec rm -f {} \;
+ find ${REPERTOIRE_CERTIFICAT} -type f -name *.key -exec rm -f {} \;
+ find ${REPERTOIRE_CERTIFICAT} -type f -name *.pem -exec rm -f {} \;
+ find ${REPERTOIRE_CERTIFICAT} -type d -empty -delete
fi
fi
if [ ! -d ${REPERTOIRE_CERTIFICAT} ]; then
--
GitLab