diff --git a/.env b/.env index 00cde75..c2f1a4b 100644 --- a/.env +++ b/.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 \ No newline at end of file diff --git a/.gitea/workflows/cd-main.yml b/.gitea/workflows/cd-main.yml index 328f647..287f859 100644 --- a/.gitea/workflows/cd-main.yml +++ b/.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 diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 488b571..e286acc 100644 --- a/docker-compose-prod.yml +++ b/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 diff --git a/src/main/resources/application-dgi.properties b/src/main/resources/application-dgi.properties index 15b007a..e33b4d8 100755 --- a/src/main/resources/application-dgi.properties +++ b/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} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f4afbd1..33c689e 100755 --- a/src/main/resources/application.properties +++ b/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