Merge pull request 'develop' (#37) from develop into main

Reviewed-on: #37

.env

@@ -1,3 +1,3 @@
-POSTGRES_DB=abomey_db
-POSTGRES_USER=infocad_user
+POSTGRES_DB=fiscad_db
+POSTGRES_USER=fiscad_user
 POSTGRES_PASSWORD=W5fwD({9*q53

.gitea/workflows/cd-main.yml

@@ -98,6 +98,7 @@ jobs:
 
           cd "$GITHUB_WORKSPACE"
           echo "Workspace: $(pwd)"
+          cat secrets/postgresPassword.txt
           ls -l secrets/
 
           docker-compose -f docker-compose-prod.yml pull || true
@@ -123,9 +124,9 @@ jobs:
                  -U ${POSTGRES_USER_FISCAD} \
                  -d ${POSTGRES_DB_FISCAD} \
                  -c 'SELECT 1;'
-          "
+          " 
 
-      # 11) Nettoyage des secrets (sécurité OBLIGATOIRE)
+      # 11) OK Nettoyage des secrets (sécurité OBLIGATOIRE)
       - name: Cleanup secrets
         if: always()
         shell: sh

docker-compose-prod.yml

@@ -41,8 +41,8 @@ services:
       SPRING_DATASOURCE_PASSWORD_FILE: /run/secrets/postgresPassword
 
       SERVER_PORT: 8282
-      IO_GMSS_FISCAD_PROFILE: abomey
-      SPRING_PROFILES_ACTIVE: abomey
+      IO_GMSS_FISCAD_PROFILE: dgi
+      SPRING_PROFILES_ACTIVE: dgi
 
       DEFAULT_USER_NAME_FILE: /run/secrets/defaultUserName
       DEFAULT_USER_PASSWORD_FILE: /run/secrets/defaultUserPassword

src/main/resources/application-dgi.properties

@@ -7,11 +7,11 @@ io.gmss.fiscad.profile=dgi
 #spring.datasource.password=W5fwD({9*q53
 # LOCAL ENV
 
-spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi
-spring.datasource.username=infocad_user
-spring.datasource.password=W5fwD({9*q53
+#spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi
+#spring.datasource.username=infocad_user
+#spring.datasource.password=W5fwD({9*q53
 
 # PROD ENV
-#spring.datasource.url=${SPRING_DATASOURCE_URL}
-#spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
-#spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
+spring.datasource.url=${SPRING_DATASOURCE_URL}
+spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
+spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}

src/main/resources/application.properties

@@ -1,6 +1,6 @@
-#spring.profiles.active=${SPRING_PROFILES_ACTIVE}
+spring.profiles.active=${SPRING_PROFILES_ACTIVE}
 #spring.profiles.active=abomey
-spring.profiles.active=dgi
+#spring.profiles.active=dgi
 spring.jpa.properties.hibernate.id.new_generator_mappings=false
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 spring.jpa.open-in-view=false