From 763fdf3e3a2bc6011f9f06b7879ba5fe644c659e Mon Sep 17 00:00:00 2001
From: Antonio Calanducci <antonio.calanducci@isti.cnr.it>
Date: Fri, 17 Nov 2023 13:42:32 +0100
Subject: [PATCH] Update prefixes for secrets in resource-manager and
 is-registry roles

---
 roles/is-registry/templates/docker-compose.yml.j2    | 12 ++++++------
 .../resource-manager/templates/docker-compose.yml.j2 | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/roles/is-registry/templates/docker-compose.yml.j2 b/roles/is-registry/templates/docker-compose.yml.j2
index 37709cb..39c0dff 100644
--- a/roles/is-registry/templates/docker-compose.yml.j2
+++ b/roles/is-registry/templates/docker-compose.yml.j2
@@ -6,11 +6,11 @@ networks:
     external: true
 
 secrets:
-  ghn-config-{{ scope_name }}:
+  {{ service_prefix }}-ghn-config-{{ scope_name }}:
     external: true
-  jndi-config-{{ scope_name }}:
+  {{ service_prefix }}-jndi-config-{{ scope_name }}:
     external: true  
-  server-config-{{ scope_name }}:
+  {{ service_prefix }}-server-config-{{ scope_name }}:
     external: true
   gcube-dev-legacy-security-key:
     external: true
@@ -26,17 +26,17 @@ services:
       - {{ is_registry_docker_network }}
       - {{ is_registry_haproxy_public_net }}
     secrets:
-      - source: ghn-config-{{ scope_name }}
+      - source: {{ service_prefix }}-ghn-config-{{ scope_name }}
         target: /home/gcube/gCore/config/GHNConfig.xml
         uid: "333"
         gid: "333"
         mode: 0440
-      - source: jndi-config-{{ scope_name }}
+      - source: {{ service_prefix }}-jndi-config-{{ scope_name }}
         target: /home/gcube/gCore/{{ config_dir }}/jndi-config.xml
         uid: "333"
         gid: "333"
         mode: 0444
-      - source: server-config-{{ scope_name }}
+      - source: {{ service_prefix }}-server-config-{{ scope_name }}
         target: /home/gcube/gCore/etc/globus_wsrf_core/server-config.wsdd
         uid: "333"
         gid: "333"
diff --git a/roles/resource-manager/templates/docker-compose.yml.j2 b/roles/resource-manager/templates/docker-compose.yml.j2
index 9062329..3d594dc 100644
--- a/roles/resource-manager/templates/docker-compose.yml.j2
+++ b/roles/resource-manager/templates/docker-compose.yml.j2
@@ -6,11 +6,11 @@ networks:
     external: true
 
 secrets:
-  ghn-config-{{ scope_name }}:
+  {{ service_prefix }}-ghn-config-{{ scope_name }}:
     external: true
-  jndi-config-{{ scope_name }}:
+  {{ service_prefix }}-jndi-config-{{ scope_name }}:
     external: true  
-  server-config-{{ scope_name }}:
+  {{ service_prefix }}-server-config-{{ scope_name }}:
     external: true
   gcube-dev-legacy-security-key:
     external: true
@@ -26,17 +26,17 @@ services:
       - {{ resource_manager_docker_network }}
       - {{ resource_manager_haproxy_public_net }}
     secrets:
-      - source: ghn-config-{{ scope_name }}
+      - source: {{ service_prefix }}-ghn-config-{{ scope_name }}
         target: /home/gcube/gCore/config/GHNConfig.xml
         uid: "333"
         gid: "333"
         mode: 0440
-      - source: jndi-config-{{ scope_name }}
+      - source: {{ service_prefix }}-jndi-config-{{ scope_name }}
         target: /home/gcube/gCore/{{ config_dir }}/jndi-config.xml
         uid: "333"
         gid: "333"
         mode: 0444
-      - source: server-config-{{ scope_name }}
+      - source: {{ service_prefix }}-server-config-{{ scope_name }}
         target: /home/gcube/gCore/etc/globus_wsrf_core/server-config.wsdd
         uid: "333"
         gid: "333"