Merge branch 'feature/devops/DLAB-4154' into dlab-develop (1ab56f1a) · Commits · dad / vitamui-pr-pastis

Commit 1ab56f1a authored 4 years ago by

Makhtar DIAGNE

Browse files

Merge branch 'feature/devops/DLAB-4154' into dlab-develop

parents c042e584 ab8a882b

No related branches found

No related tags found

1 merge request!1Feature/design/1

Hide whitespace changes

Inline Side-by-side

Showing

api/api-iam/iam-external/src/main/config/iam-external-application-dev.yml 5 additions, 5 deletions

...external/src/main/config/iam-external-application-dev.yml
api/api-iam/iam-external/src/main/config/keystore_iam-external.jks 0 additions, 0 deletions

...am/iam-external/src/main/config/keystore_iam-external.jks
api/api-iam/iam-external/src/main/config/truststore_server.jks 0 additions, 0 deletions

...pi-iam/iam-external/src/main/config/truststore_server.jks
api/api-iam/iam-external/src/main/config/truststore_server.jks.old 0 additions, 0 deletions

...am/iam-external/src/main/config/truststore_server.jks.old
api/api-iam/iam-internal/src/main/config/iam-internal-application-dev.yml 2 additions, 2 deletions

...internal/src/main/config/iam-internal-application-dev.yml
api/api-iam/iam-internal/src/main/config/keystore_iam-internal.jks 0 additions, 0 deletions

...am/iam-internal/src/main/config/keystore_iam-internal.jks
api/api-iam/iam-internal/src/main/config/truststore_server.jks 0 additions, 0 deletions

...pi-iam/iam-internal/src/main/config/truststore_server.jks
api/api-security/security-internal/src/main/config/keystore_security-internal.jks 0 additions, 0 deletions

...y-internal/src/main/config/keystore_security-internal.jks
api/api-security/security-internal/src/main/config/truststore.jks 0 additions, 0 deletions

...security/security-internal/src/main/config/truststore.jks
api/api-security/security-internal/src/main/config/truststore_server.jks 0 additions, 0 deletions

...y/security-internal/src/main/config/truststore_server.jks
cas/cas-server/src/main/config/cas-server-application-dev.yml 7 additions, 7 deletions

...cas-server/src/main/config/cas-server-application-dev.yml
cas/cas-server/src/main/config/cas-server-application-recette.yml 6 additions, 6 deletions

...server/src/main/config/cas-server-application-recette.yml
cas/cas-server/src/main/config/keystore_cas-server.jks 0 additions, 0 deletions

cas/cas-server/src/main/config/keystore_cas-server.jks
cas/cas-server/src/main/config/truststore.jks 0 additions, 0 deletions

cas/cas-server/src/main/config/truststore.jks
cas/cas-server/src/main/config/truststore_server.jks 0 additions, 0 deletions

cas/cas-server/src/main/config/truststore_server.jks
deployment/assembly-mongo.xml 18 additions, 0 deletions

deployment/assembly-mongo.xml
deployment/environments/certs/client-external/ca/ca-intermediate.crt 118 additions, 123 deletions

...environments/certs/client-external/ca/ca-intermediate.crt
deployment/environments/certs/client-external/ca/ca-root.crt 110 additions, 115 deletions

deployment/environments/certs/client-external/ca/ca-root.crt
deployment/environments/certs/client-external/clients/customer_x/customer_x.crt 121 additions, 126 deletions

...s/certs/client-external/clients/customer_x/customer_x.crt
deployment/environments/certs/client-external/clients/customer_x/customer_x.key 52 additions, 53 deletions

...s/certs/client-external/clients/customer_x/customer_x.key

with 439 additions and 437 deletions

Please register or to comment