From 836858f2b9c37f7f1946fa0e2f1be6e406025b4a Mon Sep 17 00:00:00 2001 From: Mathieu Leguay <mathieu.leguay@ouidou.fr> Date: Mon, 24 Aug 2020 17:48:25 +0200 Subject: [PATCH] [DEVOPS] Fix on Mongo scripts. --- .../1.0.0/05_security.populate_certificates_ref.js.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/docker/mongo/database_scripts/1.0.0/05_security.populate_certificates_ref.js.j2 b/tools/docker/mongo/database_scripts/1.0.0/05_security.populate_certificates_ref.js.j2 index 71579162..284fb75a 100644 --- a/tools/docker/mongo/database_scripts/1.0.0/05_security.populate_certificates_ref.js.j2 +++ b/tools/docker/mongo/database_scripts/1.0.0/05_security.populate_certificates_ref.js.j2 @@ -2,13 +2,13 @@ db = db.getSiblingDB('{{ mongodb.security.db }}') print("START security.populate_certificates_ref.js"); -{% macro insertCertificate(pemFile, contextId) -%} +{% macro insertCertificate(pemFile, contextId, host) -%} db.certificates.remove( - {"_id" : "{{ pemFile | basename | replace('.pem','_cert')}}"}, + {"_id" : "{{ host }}_{{ pemFile | basename | replace('.pem','_cert')}}"}, { justOne: true } ) db.certificates.insert({ - "_id": "{{ pemFile | basename | replace('.pem','_cert')}}", + "_id": "{{ host }}_{{ pemFile | basename | replace('.pem','_cert')}}", "contextId": "{{ contextId }}", "subjectDN": "subjectDN", "issuerDN": "issuerDN", @@ -20,7 +20,7 @@ db.certificates.insert({ {% macro process(keyPath, contextId, groupName) -%} {% for host in groups[groupName] %} - {{ insertCertificate(keyPath | replace('%host%', host), contextId) }} + {{ insertCertificate(keyPath | replace('%host%', host), contextId, host) }} {% endfor %} {%- endmacro %} -- GitLab