feat: Dockerization

Conflicts:
	ui/ui-frontend/projects/pastis/src/environments/environment.ts
	ui/ui-pastis/src/main/config/ui-pastis-application-dev.yml

.gitignore

@@ -232,11 +232,11 @@ deployment/playbooks/templates/vitamui/conf/*/*.p12
 ###################################
 # Vitam development configuration #
 ###################################
-api/api-archive-search/archive-search-internal/src/main/config/dev-vitam/*
-api/api-ingest/ingest-internal/src/main/config/dev-vitam/*
-api/api-referential/referential-internal/src/main/config/dev-vitam/*
-api/api-ingest/ingest-internal/src/main/config/dev-vitam/*
-api/api-iam/iam-internal/src/main/config/dev-vitam/*
+#api/api-archive-search/archive-search-internal/src/main/config/dev-vitam/*
+#api/api-ingest/ingest-internal/src/main/config/dev-vitam/*
+#api/api-referential/referential-internal/src/main/config/dev-vitam/*
+#api/api-ingest/ingest-internal/src/main/config/dev-vitam/*
+#api/api-iam/iam-internal/src/main/config/dev-vitam/*
 
 ##########################################
 # Mongo workspace entry-point #

.gitlab-ci.yml

 variables:
   GIT_SSL_NO_VERIFY: "true"
+  DOCKER_DRIVER: overlay2
+  DOCKER_TLS_CERTDIR: ""
+  MAVEN_OPTS: "-Dmaven.repo.local=./.m2/repository"
 
 stages:
-  - tata
+  - push_images
 
-.machine: &runner-shell
-    tags: 
-        - vitamui, shell
+.machine: &runner-shell-vitamui
+    tags:
+        - vitamui, sh
 
-test_tata:
-  stage: tata
+push_images_docker:dev:
+  stage: push_images
   only:
-    - main
-  <<: *runner-shell
+    - test/registry
+  <<: *runner-shell-vitamui
   script:
-     # Pour éviter de faire des modifications à distance accidentellement, on supprime le lien vers le référentiel d'origine, on détache la branche  de sa remote.
-    - git remote rm origin
-    # La commande "git remote add" est utilisée pour créer un dépôt distant. Le premier argument est le nom du dépôt distant et le deuxième son URL
-    - git remote add origin https://$TOKEN:x-oauth-basic@$LIEN_CIBLE
-    # on se place dans la branche du dépôt distant
-    - git checkout -b $BRANCHE_CIBLE
-    # on met à jour la branche distante (Logiquement, elle devrait toujours être au même niveau que la master local)
-    - git pull origin $BRANCHE_CIBLE
-    # on push sur github sur la branche choisie 
-    - git push --set-upstream origin $BRANCHE_CIBLE
+    - docker tag cinesdaddev/vitamui-security-internal 10.6.10.58:5000/vitamui-security-internal
+    - docker push 10.6.10.58:5000/vitamui-security-internal
+  dependencies: []

Dockerfile

+FROM maven:3.6.3-jdk-11 as build-services
+LABEL name=build-services
+COPY . /app
+WORKDIR /app
+RUN mvn clean install -DskipTests
+WORKDIR /app/ui/ui-pastis
+RUN mvn clean install -Pdev
+
+FROM adoptopenjdk/openjdk11 as dependencies
+
+LABEL name=dependencies
+COPY --from=build-services /app/pom.xml /app/pom.xml
+COPY --from=build-services /app/dev-deployment /app/dev-deployment
+
+COPY --from=build-services /app/api/api-security/security-internal/target /app/api/api-security/security-internal/target
+COPY --from=build-services /app/api/api-security/security-internal/run.sh /app/api/api-security/security-internal/run.sh
+COPY --from=build-services /app/api/api-security/security-internal/src/main/config /app/api/api-security/security-internal/src/main/config
+COPY --from=build-services /app/api/api-security/security-internal/pom.xml /app/api/api-security/security-internal/pom.xml
+
+COPY --from=build-services /app/api/api-iam/iam-internal/target /app/api/api-iam/iam-internal/target
+COPY --from=build-services /app/api/api-iam/iam-internal/run.sh /app/api/api-iam/iam-internal/run.sh
+COPY --from=build-services /app/api/api-iam/iam-internal/src/main/config /app/api/api-iam/iam-internal/src/main/config
+COPY --from=build-services /app/api/api-iam/iam-internal/pom.xml /app/api/api-iam/iam-internal/pom.xml
+
+COPY --from=build-services /app/api/api-iam/iam-external/target /app/api/api-iam/iam-external/target
+COPY --from=build-services /app/api/api-iam/iam-external/run.sh /app/api/api-iam/iam-external/run.sh
+COPY --from=build-services /app/api/api-iam/iam-external/src/main/config /app/api/api-iam/iam-external/src/main/config
+COPY --from=build-services /app/api/api-iam/iam-external/pom.xml /app/api/api-iam/iam-external/pom.xml
+
+COPY --from=build-services /app/cas/cas-server/target /app/cas/cas-server/target
+COPY --from=build-services /app/cas/cas-server/run.sh /app/cas/cas-server/run.sh
+COPY --from=build-services /app/cas/cas-server/src/main/config /app/cas/cas-server/src/main/config
+COPY --from=build-services /app/cas/cas-server/pom.xml /app/cas/cas-server/pom.xml
+COPY --from=build-services /app/cas/pom.xml /app/cas/pom.xml
+
+COPY --from=build-services /app/ui/ui-portal/target /app/ui/ui-portal/target
+COPY --from=build-services /app/ui/ui-portal/run.sh /app/ui/ui-portal/run.sh
+COPY --from=build-services /app/ui/ui-portal/src/main/config /app/ui/ui-portal/src/main/config
+COPY --from=build-services /app/ui/ui-portal/pom.xml /app/ui/ui-portal/pom.xml
+
+
+COPY --from=build-services /app/ui/ui-identity/target /app/ui/ui-identity/target
+COPY --from=build-services /app/ui/ui-identity/run.sh /app/ui/ui-identity/run.sh
+COPY --from=build-services /app/ui/ui-identity/src/main/config /app/ui/ui-identity/src/main/config
+COPY --from=build-services /app/ui/ui-identity/pom.xml /app/ui/ui-identity/pom.xml
+
+COPY --from=build-services /app/ui/ui-pastis/target /app/ui/ui-pastis/target
+COPY --from=build-services /app/ui/ui-pastis/run.sh /app/ui/ui-pastis/run.sh
+COPY --from=build-services /app/ui/ui-pastis/src/main/config /app/ui/ui-pastis/src/main/config
+COPY --from=build-services /app/ui/ui-pastis/pom.xml /app/ui/ui-pastis/pom.xml
+
+COPY --from=build-services /app/api/api-iam/iam-internal-client/target /app/api/api-iam/iam-internal-client/target
+COPY --from=build-services /app/api/api-iam/iam-internal-client/pom.xml /app/api/api-iam/iam-internal-client/pom.xml
+
+COPY --from=build-services /app/api/api-iam/iam-external-client/target /app/api/api-iam/iam-external-client/target
+COPY --from=build-services /app/api/api-iam/iam-external-client/pom.xml /app/api/api-iam/iam-external-client/pom.xml
+
+COPY --from=build-services /app/api/api-iam/iam-commons/target /app/api/api-iam/iam-commons/target
+COPY --from=build-services /app/api/api-iam/iam-commons/pom.xml /app/api/api-iam/iam-commons/pom.xml
+
+COPY --from=build-services /app/commons /app/commons
+COPY --from=build-services /app/api/api-iam/iam-commons /app/api/api-iam/iam-commons
+COPY --from=build-services /app/api/api-iam/iam-security /app/api/api-iam/iam-security
+COPY --from=build-services /app/api/api-security/security-client /app/api/api-security/security-client
+COPY --from=build-services /app/api/api-security/security-commons /app/api/api-security/security-commons
+
+COPY --from=build-services /app/ui/ui-frontend/ /app/ui/ui-frontend/
+COPY --from=build-services /app/ui/ui-frontend-common/ /app/ui/ui-frontend-common/
+COPY --from=build-services /app/ui/ui-commons/target /app/ui/ui-commons/target
+COPY --from=build-services /app/ui/ui-commons/pom.xml /app/ui/ui-commons/pom.xml
+
+
+FROM adoptopenjdk/openjdk11 AS security-internal
+LABEL name=security-internal
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-security/security-commons /app/api/api-security/security-commons
+COPY --from=dependencies /app/commons/commons-mongo /app/commons/commons-mongo
+COPY --from=dependencies /app/api/api-security/security-internal /app/api/api-security/security-internal
+COPY --from=dependencies /app/dev-deployment /app/dev-deployment
+WORKDIR /app/api/api-security/security-internal
+RUN chmod +x run.sh
+EXPOSE 8084
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS iam-internal
+LABEL name=iam-internal
+COPY --from=dependencies /app/commons/commons-vitam /app/commons/commons-vitam
+COPY --from=dependencies /app/commons/commons-logbook /app/commons/commons-logbook
+COPY --from=dependencies /app/commons/commons-mongo /app/commons/commons-mongo
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-iam/iam-commons /app/api/api-iam/iam-commons
+COPY --from=dependencies /app/api/api-iam/iam-security /app/api/api-iam/iam-security
+COPY --from=dependencies /app/api/api-security/security-client /app/api/api-security/security-client
+COPY --from=dependencies /app/api/api-iam/iam-internal /app/api/api-iam/iam-internal
+COPY --from=dependencies /app/dev-deployment /app/dev-deployment
+WORKDIR /app/api/api-iam/iam-internal
+RUN chmod +x run.sh
+EXPOSE 7083
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS iam-external
+LABEL name=iam-external
+COPY --from=dependencies /app/commons/commons-vitam /app/commons/commons-vitam
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-iam/iam-commons /app/api/api-iam/iam-commons
+COPY --from=dependencies /app/api/api-iam/iam-security /app/api/api-iam/iam-security
+COPY --from=dependencies /app/api/api-security/security-client /app/api/api-security/security-client
+COPY --from=dependencies /app/api/api-iam/iam-internal-client /app/api/api-iam/iam-internal-client
+COPY --from=dependencies /app/api/api-iam/iam-external /app/api/api-iam/iam-external
+COPY --from=dependencies /app/dev-deployment /app/dev-deployment
+WORKDIR /app/api/api-iam/iam-external
+RUN chmod +x run.sh
+EXPOSE 8083
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS ui-portal
+LABEL name=ui-portal
+COPY --from=dependencies /app/api/api-iam/iam-external-client /app/api/api-iam/iam-external-client
+COPY --from=dependencies /app/ui/ui-frontend/target /app/ui/ui-frontend/target
+COPY --from=dependencies /app/ui/ui-frontend/dist /app/ui/ui-frontend/dist
+COPY --from=dependencies /app/ui/ui-frontend/pom.xml /app/ui/ui-frontend/pom.xml
+COPY --from=dependencies /app/ui/ui-commons /app/ui/ui-commons
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-iam/iam-commons /app/api/api-iam/iam-commons
+COPY --from=dependencies /app/ui/ui-portal /app/ui/ui-portal
+COPY --from=dependencies /app/dev-deployment /app/dev-deployment
+WORKDIR /app/ui/ui-portal
+RUN chmod +x run.sh
+EXPOSE 9000
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS ui-identity
+LABEL name=ui-identity
+COPY --from=dependencies /app/api/api-iam/iam-external-client /app/api/api-iam/iam-external-client
+COPY --from=dependencies /app/ui/ui-frontend/target /app/ui/ui-frontend/target
+COPY --from=dependencies /app/ui/ui-frontend/dist /app/ui/ui-frontend/dist
+COPY --from=dependencies /app/ui/ui-frontend/pom.xml /app/ui/ui-frontend/pom.xml
+COPY --from=dependencies /app/ui/ui-commons /app/ui/ui-commons
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/commons/commons-security /app/commons/commons-security
+COPY --from=dependencies /app/api/api-iam/iam-commons /app/api/api-iam/iam-commons
+COPY --from=dependencies /app/ui/ui-identity /app/ui/ui-identity
+COPY --from=dependencies /app/dev-deployment /app/dev-deployment
+WORKDIR /app/ui/ui-identity
+RUN chmod +x run.sh
+EXPOSE 9001
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS ui-pastis
+LABEL name=ui-pastis
+COPY --from=dependencies /app/ui/ui-pastis /app/ui/ui-pastis
+COPY --from=dependencies /app/dev-deployment /app/dev-deployment
+WORKDIR /app/ui/ui-pastis
+RUN chmod +x run.sh
+EXPOSE 8051
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS cas-server
+LABEL name=cas-server
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-iam/iam-commons /app/api/api-iam/iam-commons
+COPY --from=dependencies /app/api/api-iam/iam-external-client /app/api/api-iam/iam-external-client
+COPY --from=dependencies /app/cas /app/cas
+COPY --from=dependencies /app/dev-deployment /app/dev-deployment
+WORKDIR /app/cas/cas-server
+RUN chmod +x run.sh
+EXPOSE 8080
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM node:12.16.1 AS PORTAL
+LABEL name=portal-front
+COPY --from=dependencies /app/ui/ui-frontend /app/ui-frontend
+COPY --from=dependencies /app/dev-deployment /app/ui-frontend/dev-deployment
+WORKDIR /app/ui-frontend
+EXPOSE 4200
+ENTRYPOINT ["npm", "run", "start:portal"]
+
+FROM node:12.16.1 AS IDENTITY
+LABEL name=identity-front
+COPY --from=dependencies /app/ui/ui-frontend /app/ui-frontend
+COPY --from=dependencies /app/dev-deployment /app/ui-frontend/dev-deployment
+WORKDIR /app/ui-frontend
+EXPOSE 4201
+ENTRYPOINT ["npm", "run", "start:identity"]
+
+FROM node:12.16.1 AS PASTIS
+LABEL name=pastis-front
+COPY --from=dependencies /app/ui/ui-frontend /app/ui-frontend
+COPY --from=dependencies /app/ui/ui-frontend-common /app/ui-frontend-common
+COPY --from=dependencies /app/dev-deployment /app/ui-frontend/dev-deployment
+WORKDIR /app/ui-frontend
+EXPOSE 4251
+ENTRYPOINT ["npm", "run", "start:pastis"]

Dockerfile-standalone

+FROM maven:3.6.3-jdk-11 as build-services
+LABEL name=build-services
+COPY . /app
+WORKDIR /app/ui
+RUN mvn clean install -DskipTests -Pstandalone --projects ui-pastis,ui-frontend-common,ui-frontend
+
+FROM adoptopenjdk/openjdk11 AS ui-pastis
+LABEL name=pastis-standalone
+COPY --from=build-services /app/ui/ui-pastis/target /app/ui/ui-pastis/target
+COPY --from=build-services /app/ui/ui-pastis/run-standalone.sh /app/ui/ui-pastis/run-standalone.sh
+COPY --from=build-services /app/ui/ui-pastis/src/main/config /app/ui/ui-pastis/src/main/config
+COPY --from=build-services /app/ui/ui-pastis/pom.xml /app/ui/ui-pastis/pom.xml
+WORKDIR /app/ui/ui-pastis
+RUN chmod +x run-standalone.sh
+EXPOSE 8080
+ENTRYPOINT ["/bin/bash", "./run-standalone.sh"]

api/api-iam/iam-external/run.sh

@@ -7,4 +7,4 @@ cp -r src/main/config target/src/main/config
 #retrieve version
 version="$(grep -oP '(?<=>).*?(?=</version>)' pom.xml | grep -v 'version')"
 
-./target/iam-external-$(echo $version).jar -Xms128m -Xmx512m --spring.config.additional-location=file:src/main/config/iam-external-application-dev.yml
+java -jar target/iam-external-$(echo $version).jar -Xms128m -Xmx512m --spring.config.additional-location=file:src/main/config/iam-external-application-dev.yml

api/api-iam/iam-external/src/main/config/iam-external-application-dev.yml

@@ -20,10 +20,10 @@ server-identity:
   identityServerId: 1
 
 server:
-  host:
+  host: localhost
   port: 8083
   ssl:
-    key-store: ../../../dev-deployment/environments/keystores/server/localhost/keystore_iam-internal.jks
+    key-store: ../../../dev-deployment/environments/keystores/server/sandbox23-adm.cines.fr/keystore_iam-internal.jks
     key-store-password: changeme
     key-password: changeme
     trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks

api/api-iam/iam-internal/src/main/config/dev-vitam/access-external-client.conf

+serverHost: access-external.service.consul
+serverPort: 8444
+secure: true
+sslConfiguration :
+ keystore :
+  - keyPath:  src/main/config/dev-vitam/keystore_vitamui.p12
+    keyPassword: azerty4
+ truststore :
+  - keyPath: src/main/config/dev-vitam/truststore_vitam.jks
+    keyPassword: azerty10
+hostnameVerification: true

api/api-iam/iam-internal/src/main/config/dev-vitam/ingest-external-client.conf

+serverHost: ingest-external.service.consul
+serverPort: 8443
+secure: true
+sslConfiguration :
+ keystore :
+  - keyPath: src/main/config/dev-vitam/keystore_vitamui.p12
+    keyPassword: azerty4
+ truststore :
+  - keyPath: src/main/config/dev-vitam/truststore_vitam.jks
+    keyPassword: azerty10
+hostnameVerification: true

api/api-iam/iam-internal/src/main/config/iam-internal-application-dev.yml

@@ -20,7 +20,7 @@ server-identity:
   identityServerId: 1
 
 server:
-  host:
+  host: localhost
   port: 7083
 
 management:
@@ -33,15 +33,15 @@ security:
   port: 8084
 
 cas-client:
-  server-host: dev.vitamui.com
+  server-host: sandbox23-adm.cines.fr
   server-port: 8080
   secure: true
   ssl-configuration:
     truststore:
-      key-path: ../../../dev-deployment/environments/keystores/server/localhost/keystore_iam-internal.jks
+      key-path: ../../../dev-deployment/environments/keystores/server/sandbox23-adm.cines.fr/keystore_iam-internal.jks
       key-password: changeme
     keystore:
-      key-path:  ../../../dev-deployment/environments/keystores/server/localhost/keystore_iam-internal.jks
+      key-path:  ../../../dev-deployment/environments/keystores/server/sandbox23-adm.cines.fr/keystore_iam-internal.jks
       key-password: changeme
       type: JKS
     hostname-verification: false
@@ -49,7 +49,7 @@ cas-client:
 cas.reset.password.url: /cas/extras/resetPassword?username={username}&firstname={firstname}&lastname={lastname}&language={language}&ttl=1day
 
 login:
-  url: http://dev.vitamui.com:8080/cas/login
+  url: http://sandbox23-adm.cines.fr:8080/cas/login
 
 login.attempts.maximum.failures: 5
 login.attempts.time.interval: 20

api/api-ingest/pom.xml

@@ -14,7 +14,6 @@
     <description>VITAMUI Ingest API</description>
 
     <modules>
-        <module>ingest-internal</module>
         <module>ingest-external</module>
         <module>ingest-internal-client</module>
         <module>ingest-external-client</module>

cas/cas-server/run.sh

 #!/bin/bash
-mvn clean package -DskipTests
+#mvn clean package -DskipTests
 java -Dspring.config.additional-location=src/main/config/cas-server-application-dev.yml -jar -Xms128m -Xmx512m target/cas-server.war

cas/cas-server/src/main/config/cas-server-application-dev.yml

@@ -9,10 +9,10 @@ spring:
 
 server:
   ssl:
-    key-store: ../../dev-deployment/environments/keystores/server/localhost/keystore_cas-server.jks
+    key-store: ../../dev-deployment/environments/keystores/server/sandbox23-adm.cines.fr/keystore_cas-server.jks
     key-store-password: changeme
     key-password: changeme
-  host: dev.vitamui.com
+  host: sandbox23-adm.cines.fr
   port: 8080
   servlet:
     context-path: /cas
@@ -34,7 +34,7 @@ iam-client:
   secure: true
   ssl-configuration:
     keystore:
-      key-path: ../../dev-deployment/environments/keystores/server/localhost/keystore_cas-server.jks
+      key-path: ../../dev-deployment/environments/keystores/server/sandbox23-adm.cines.fr/keystore_cas-server.jks
       key-password: changeme
       type: JKS
     truststore:
@@ -55,7 +55,7 @@ cas.tgc.crypto.enabled: false
 cas.webflow.crypto.enabled: true
 cas.authn.pm.reset.crypto.enabled: true
 
-cas.server.prefix: https://dev.vitamui.com:8080/cas
+cas.server.prefix: https://sandbox23-adm.cines.fr:8080/cas
 login.url: ${cas.server.prefix}/login
 
 cas.serviceRegistry.mongo.clientUri: mongodb://mongod_dbuser_cas:mongod_dbpwd_cas@localhost:27018/cas
@@ -129,7 +129,7 @@ cas.smsProvider.twilio.accountId: changeme
 cas.smsProvider.twilio.token: changeme
 
 
-vitamui.portal.url: https://dev.vitamui.com:4200/
+vitamui.portal.url: https://sandbox23-adm.cines.fr:4200/
 
 
 token.api.cas: tokcas_ie6UZsEcHIWrfv2x

dev-deployment/environments/certs/server/hosts/localhost/archive-search-external.crt

 Certificate:
     Data:
         Version: 1 (0x0)
-        Serial Number: 30 (0x1e)
-        Signature Algorithm: sha256WithRSAEncryption
+        Serial Number: 41 (0x29)
+    Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=fr, ST=idf, L=paris, O=vitamui, OU=authorities, CN=ca_intermediate_server
         Validity
-            Not Before: Dec  9 09:40:45 2020 GMT
-            Not After : Dec  9 09:40:45 2023 GMT
-        Subject: C=fr, ST=idf, L=paris, O=vitamui, CN=dev.vitamui.com
+            Not Before: May 17 12:24:56 2021 GMT
+            Not After : May 16 12:24:56 2024 GMT
+        Subject: C=fr, ST=idf, L=paris, O=vitamui, CN=sandbox23-adm.cines.fr
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (4096 bit)
+                Public-Key: (4096 bit)
                 Modulus:
-                    00:d5:b4:e2:b6:89:26:93:16:21:e3:7e:e2:17:b2:
-                    28:d8:30:74:2b:51:c2:44:04:35:ea:ea:f5:3d:66:
-                    d1:aa:c2:50:7c:bb:16:a4:f8:3b:a9:d9:83:dc:85:
-                    2e:2e:c5:49:92:8d:13:f9:a2:6c:69:ba:16:33:78:
-                    42:fd:2e:89:59:98:59:48:15:a2:9d:29:bf:d7:ce:
-                    ba:4e:75:9e:b2:c0:f1:b3:e8:07:8f:77:19:62:85:
-                    a0:a4:5d:c5:e1:28:cb:80:31:a5:f6:49:ef:33:70:
-                    55:cc:71:32:6f:14:42:7a:f3:47:c8:97:1c:56:89:
-                    d4:7b:c5:24:10:94:d4:a0:2a:f1:ce:96:9d:49:ad:
-                    da:43:d9:ff:59:fd:e2:19:9a:c9:63:bc:30:30:59:
-                    92:a9:d9:9b:22:3a:30:49:8b:ae:52:db:f3:f5:42:
-                    b7:66:91:f0:e4:8b:d2:5d:e6:a3:7c:09:a1:49:c5:
-                    68:72:e7:70:51:cd:62:14:2f:3d:7d:71:4a:15:43:
-                    35:3a:44:76:95:ad:95:6f:5d:24:d2:98:19:fd:e6:
-                    33:00:c6:4a:05:24:70:72:52:e6:86:9a:7a:85:58:
-                    09:1f:ec:05:50:11:25:da:c5:f4:54:55:0f:c7:d8:
-                    f6:46:f5:23:0f:26:1d:be:92:de:5d:2d:f4:29:cc:
-                    98:51:dd:c3:67:e3:a5:ba:df:db:f1:12:6c:f4:ac:
-                    36:e4:7a:bc:1f:95:6d:bb:72:e2:60:2f:da:31:53:
-                    a7:05:ba:b4:0d:9b:e5:89:e8:c1:33:e4:08:61:64:
-                    d3:68:ab:75:d1:c8:05:a2:3b:5e:df:c4:29:94:4f:
-                    d1:26:41:f6:2f:20:ba:21:2f:53:14:5f:f5:7b:dc:
-                    8c:e9:9e:30:b3:f4:cc:7e:c7:75:56:8f:20:6e:4a:
-                    53:56:18:26:27:16:79:b6:3b:6c:c0:68:3d:0f:c0:
-                    47:39:54:57:7f:7e:01:c4:60:37:36:cb:38:61:6f:
-                    2c:69:5c:15:3e:7a:7c:d6:f6:e4:61:29:c0:c1:d7:
-                    57:af:7b:46:ad:45:82:b5:b2:50:f7:91:9e:b9:6d:
-                    44:86:22:5f:b0:51:60:3b:c5:0d:03:ad:24:91:33:
-                    41:c4:3d:0b:77:c1:5a:12:ca:b5:d7:1a:b3:f8:0b:
-                    8c:0a:ae:86:8f:7b:2f:29:4e:0e:9d:3e:cc:d8:1e:
-                    b8:a4:2f:fd:a1:0a:4d:51:4d:95:d3:de:2d:12:6a:
-                    b9:b2:22:34:f1:d3:bd:6c:bc:37:7c:fb:e8:df:46:
-                    5a:d7:b1:15:c6:8c:c7:d2:cb:a3:54:19:b4:ec:98:
-                    b0:cb:f8:30:71:f2:54:06:17:95:2a:f2:e4:a2:a4:
-                    c0:7f:9d
+                    00:ac:8a:03:fd:0a:bd:48:44:de:f4:19:3c:61:20:
+                    c9:86:ee:16:10:8f:12:fe:70:2d:61:e7:95:55:2f:
+                    ef:ae:dd:c1:28:c3:39:aa:d0:b0:03:cc:6a:57:be:
+                    f1:cd:50:c9:cf:57:d0:42:cb:f8:34:bc:8e:aa:40:
+                    a4:c2:ae:27:15:4d:72:83:c1:b6:fc:ea:ec:16:59:
+                    4c:1d:a5:0e:ae:35:ab:ce:62:cc:ba:76:81:4a:ff:
+                    54:da:a5:b5:9e:86:c4:9a:86:d5:de:73:07:d9:c4:
+                    8a:af:34:61:6a:35:17:eb:4d:b8:7e:86:1b:10:7c:
+                    17:1c:cd:50:1b:ce:eb:c0:78:0e:84:4e:46:35:bc:
+                    35:02:71:86:e6:65:73:95:3a:4b:d3:61:0e:ce:dd:
+                    35:76:34:5b:16:a6:f0:77:99:75:fc:0b:be:69:fd:
+                    89:fc:54:a2:b6:70:6e:ec:0d:0a:e9:2a:52:4e:bc:
+                    75:32:3a:ba:76:6b:54:2e:9f:2f:a2:eb:07:52:69:
+                    17:e2:27:7a:d7:81:d8:fa:1b:fd:22:b0:87:1b:37:
+                    49:f2:27:51:b4:f2:7b:52:fc:02:63:16:88:26:79:
+                    40:05:0b:77:27:4e:f7:6c:e5:51:3b:31:a8:e3:b0:
+                    70:4f:31:90:b8:c3:82:16:5c:2f:ce:da:c2:4c:cd:
+                    c2:ec:ae:84:3e:f2:9d:e7:9c:96:ea:3e:7e:57:86:
+                    42:30:16:12:f7:8d:60:e3:2e:61:22:8c:bc:57:19:
+                    b9:4c:6e:1f:9b:1e:c9:be:69:20:9e:d8:43:71:d2:
+                    ea:39:e9:3c:d0:d4:b3:1b:4e:4a:43:22:70:55:32:
+                    75:35:00:73:00:bc:df:e4:8e:10:bb:b3:62:93:ab:
+                    34:31:41:52:f3:5c:a6:b4:1c:38:c0:ec:e7:31:f7:
+                    78:3e:c3:53:ce:d1:58:32:e8:2f:e4:79:16:38:b3:
+                    65:69:7f:f5:40:c9:9c:2d:98:34:d5:69:1c:44:94:
+                    49:01:5a:ed:4c:52:22:98:2b:16:ea:ff:a6:4a:ff:
+                    eb:4f:b6:7e:7d:68:05:06:78:ee:03:6e:68:1c:85:
+                    00:f5:8a:4d:d1:77:43:1b:ab:a2:cd:13:df:f4:a1:
+                    f7:a4:2d:e9:3d:93:96:7d:89:8c:40:d4:b8:08:a7:
+                    61:b2:b7:7c:d3:a6:c9:bb:64:f0:fa:91:80:ee:6b:
+                    03:12:0d:0b:4a:54:b2:fc:16:29:36:ae:a0:4d:ac:
+                    d8:04:e7:7a:f1:43:4b:f3:06:6b:23:24:df:69:44:
+                    49:a3:10:b4:ea:3e:b6:12:61:3f:bf:da:29:f4:f8:
+                    c2:cb:3d:0a:4d:18:a0:2d:29:af:48:f7:6f:f3:13:
+                    77:5e:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
-         67:ea:8f:09:0a:5c:15:42:cf:18:c1:b6:37:7d:c7:25:42:17:
-         6c:62:e7:a1:52:1c:93:0f:a8:d7:31:2f:2e:1b:37:60:df:82:
-         19:bb:2c:b9:65:be:4d:60:82:a7:c8:4f:2d:d2:e2:0e:8d:9f:
-         b0:cd:d4:96:4b:08:2e:c4:47:6a:04:9a:df:5e:b1:4f:66:d7:
-         65:4f:87:37:19:a2:44:15:a9:6d:a2:a2:2a:80:69:6b:35:d7:
-         54:0e:c1:ab:08:43:c2:df:77:c3:cf:b5:9e:83:a8:3a:2b:1c:
-         6f:df:92:c5:1b:2d:1f:3a:f2:5a:48:f2:9e:fa:15:6f:bc:09:
-         6b:e6:7b:74:c9:57:b6:d7:4a:3e:01:d9:29:92:7a:89:7e:6e:
-         eb:85:a6:e5:c5:e3:bb:66:8b:64:e8:3a:6d:0e:a2:e9:68:8a:
-         4f:a2:b4:10:cf:45:8c:1f:49:4b:ae:41:99:89:5b:56:a8:bc:
-         40:b8:97:d9:5c:c8:15:04:93:61:c2:60:5b:6a:2c:10:e3:41:
-         da:a2:0d:f4:35:34:9b:59:3a:f7:0d:9a:2f:03:a7:56:e9:75:
-         9b:ce:94:07:97:9a:c7:28:85:35:27:da:64:63:c8:3c:72:f7:
-         72:28:9d:1e:58:65:18:bf:d4:33:2c:e2:c7:19:7d:40:eb:91:
-         6b:8b:84:f4:e4:05:44:c5:e9:ea:3d:5e:86:21:0a:8e:c3:89:
-         a3:61:10:94:c2:fa:45:4d:5d:5e:2f:83:75:81:79:bb:c8:db:
-         e4:ad:a9:d4:4b:df:8f:5e:a8:82:68:15:28:13:c1:3e:a3:d7:
-         2b:d4:55:1d:d0:67:43:3a:4d:cc:b7:e3:24:8d:27:eb:79:62:
-         cb:fa:dd:e3:ae:21:90:8a:0f:9b:3e:62:b3:95:5c:24:16:07:
-         90:c1:a4:74:06:cf:d4:45:92:9f:bf:fe:05:c6:c2:8d:86:db:
-         f9:1f:05:d4:56:fc:9b:ca:65:03:0b:24:da:f0:94:f6:1f:7d:
-         6e:3a:32:bb:c0:34:65:74:f6:72:f4:b2:00:3c:76:40:37:64:
-         c3:ec:c1:e4:e3:93:34:b8:58:0c:2c:7f:de:4e:38:77:58:8e:
-         d0:67:e4:c1:00:16:08:b2:b5:d0:95:ed:22:fb:c1:31:9f:1b:
-         81:19:c2:76:12:ad:c6:0d:1b:39:12:65:ff:25:60:e8:7b:64:
-         f2:41:a8:60:8b:41:26:2b:1b:50:88:68:b6:9d:bb:57:26:c9:
-         07:85:c8:7f:6e:97:42:f7:26:de:e7:51:7a:a7:e3:58:49:23:
-         10:21:0c:78:d6:d1:49:3a:f6:e4:19:2e:7a:29:17:47:6b:57:
-         c0:f9:c7:28:ef:7f:04:50
+         36:46:15:10:f9:7d:10:31:0a:c1:8a:df:3d:cd:48:0d:f7:27:
+         ea:38:19:27:34:df:fd:46:52:01:c8:7d:30:cc:b5:85:4f:a8:
+         b8:6d:b9:ac:73:51:e5:2f:56:11:74:eb:6b:03:23:6b:96:4c:
+         70:05:f3:40:77:69:1f:e9:3f:b8:fd:4e:45:76:f0:c4:9c:ab:
+         78:81:8f:b5:a4:b8:f3:b9:62:b7:8e:08:ec:2d:2c:40:07:0c:
+         dd:81:14:e1:28:66:04:a0:f0:28:da:2d:7b:68:51:74:9d:99:
+         c3:8c:eb:d7:70:2d:9a:8b:a0:7d:3c:2e:46:2e:26:fb:c5:a4:
+         11:1f:ac:3b:f4:a3:5c:8f:d0:28:f5:13:1f:d5:ea:53:2b:a3:
+         c4:80:9a:3e:89:e1:a9:28:3f:6a:c6:0d:d4:88:08:2e:5d:19:
+         01:e2:74:4e:5e:d0:c6:f2:9b:b7:78:1c:6d:ca:f3:e7:29:4a:
+         76:32:9c:5e:17:b3:28:0d:4d:ac:f2:52:5c:22:10:de:c3:b6:
+         7c:f8:86:14:9a:ce:6c:27:ed:67:8e:e7:0a:63:ba:c9:b2:27:
+         42:40:a0:3f:1f:56:d9:20:83:61:92:fb:81:86:84:69:31:41:
+         9e:f7:fe:b3:e2:3e:4c:1a:43:fe:b4:60:16:ca:60:4a:6c:ca:
+         cf:f0:e2:9d:51:f9:45:bf:36:f5:90:a6:3b:32:1b:bb:a2:31:
+         8d:28:ed:8c:f4:e0:2b:61:d2:ae:20:6b:8f:94:ba:5e:8f:79:
+         2e:38:4c:3a:e2:50:69:f6:79:60:d6:45:a3:96:e9:28:63:dc:
+         21:44:cd:aa:2e:21:99:64:fa:eb:13:a7:43:49:a1:d6:cb:47:
+         b2:01:15:fb:1e:a0:f6:f9:44:57:ca:71:7b:1d:85:7b:85:76:
+         bf:0d:61:d3:bb:6a:55:ff:00:b1:c9:a8:0e:2b:0d:14:17:cd:
+         54:a8:ed:61:70:e9:81:7d:d0:65:49:0b:ad:ad:1d:d5:22:c3:
+         1b:f1:0e:dc:51:e4:c9:a4:45:dc:c0:b4:8f:a1:46:51:a6:b8:
+         e6:b2:25:23:f6:a5:34:3f:a0:0f:5f:19:06:15:29:74:f0:d8:
+         9d:85:d1:e3:cd:6d:dd:b3:62:19:ab:73:c7:47:1b:98:78:71:
+         4c:e0:79:d5:00:b6:c6:1c:dd:03:b5:99:b3:bc:41:e7:5f:a3:
+         73:11:14:72:7a:7c:0a:d7:6d:4e:88:84:fa:3c:7d:06:84:cc:
+         2d:76:68:9a:0e:54:b4:a6:ec:ef:89:a3:e9:b4:09:c7:18:93:
+         56:ff:1a:be:86:e8:46:9b:72:b8:18:a1:9f:65:24:1d:c9:b3:
+         b2:a2:a4:d7:3d:21:df:00
 -----BEGIN CERTIFICATE-----
-MIIFPzCCAycCAR4wDQYJKoZIhvcNAQELBQAwdDELMAkGA1UEBhMCZnIxDDAKBgNV
+MIIFRjCCAy4CASkwDQYJKoZIhvcNAQELBQAwdDELMAkGA1UEBhMCZnIxDDAKBgNV
 BAgMA2lkZjEOMAwGA1UEBwwFcGFyaXMxEDAOBgNVBAoMB3ZpdGFtdWkxFDASBgNV
 BAsMC2F1dGhvcml0aWVzMR8wHQYDVQQDDBZjYV9pbnRlcm1lZGlhdGVfc2VydmVy
-MB4XDTIwMTIwOTA5NDA0NVoXDTIzMTIwOTA5NDA0NVowVzELMAkGA1UEBhMCZnIx
+MB4XDTIxMDUxNzEyMjQ1NloXDTI0MDUxNjEyMjQ1NlowXjELMAkGA1UEBhMCZnIx
 DDAKBgNVBAgMA2lkZjEOMAwGA1UEBwwFcGFyaXMxEDAOBgNVBAoMB3ZpdGFtdWkx
-GDAWBgNVBAMMD2Rldi52aXRhbXVpLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBANW04raJJpMWIeN+4heyKNgwdCtRwkQENerq9T1m0arCUHy7FqT4
-O6nZg9yFLi7FSZKNE/mibGm6FjN4Qv0uiVmYWUgVop0pv9fOuk51nrLA8bPoB493
-GWKFoKRdxeEoy4AxpfZJ7zNwVcxxMm8UQnrzR8iXHFaJ1HvFJBCU1KAq8c6WnUmt
-2kPZ/1n94hmayWO8MDBZkqnZmyI6MEmLrlLb8/VCt2aR8OSL0l3mo3wJoUnFaHLn
-cFHNYhQvPX1xShVDNTpEdpWtlW9dJNKYGf3mMwDGSgUkcHJS5oaaeoVYCR/sBVAR
-JdrF9FRVD8fY9kb1Iw8mHb6S3l0t9CnMmFHdw2fjpbrf2/ESbPSsNuR6vB+Vbbty
-4mAv2jFTpwW6tA2b5YnowTPkCGFk02irddHIBaI7Xt/EKZRP0SZB9i8guiEvUxRf
-9XvcjOmeMLP0zH7HdVaPIG5KU1YYJicWebY7bMBoPQ/ARzlUV39+AcRgNzbLOGFv
-LGlcFT56fNb25GEpwMHXV697Rq1FgrWyUPeRnrltRIYiX7BRYDvFDQOtJJEzQcQ9
-C3fBWhLKtdcas/gLjAquho97LylODp0+zNgeuKQv/aEKTVFNldPeLRJqubIiNPHT
-vWy8N3z76N9GWtexFcaMx9LLo1QZtOyYsMv4MHHyVAYXlSry5KKkwH+dAgMBAAEw
-DQYJKoZIhvcNAQELBQADggIBAGfqjwkKXBVCzxjBtjd9xyVCF2xi56FSHJMPqNcx
-Ly4bN2Dfghm7LLllvk1ggqfITy3S4g6Nn7DN1JZLCC7ER2oEmt9esU9m12VPhzcZ
-okQVqW2ioiqAaWs111QOwasIQ8Lfd8PPtZ6DqDorHG/fksUbLR868lpI8p76FW+8
-CWvme3TJV7bXSj4B2SmSeol+buuFpuXF47tmi2ToOm0Oouloik+itBDPRYwfSUuu
-QZmJW1aovEC4l9lcyBUEk2HCYFtqLBDjQdqiDfQ1NJtZOvcNmi8Dp1bpdZvOlAeX
-mscohTUn2mRjyDxy93IonR5YZRi/1DMs4scZfUDrkWuLhPTkBUTF6eo9XoYhCo7D
-iaNhEJTC+kVNXV4vg3WBebvI2+StqdRL349eqIJoFSgTwT6j1yvUVR3QZ0M6Tcy3
-4ySNJ+t5Ysv63eOuIZCKD5s+YrOVXCQWB5DBpHQGz9RFkp+//gXGwo2G2/kfBdRW
-/JvKZQMLJNrwlPYffW46MrvANGV09nL0sgA8dkA3ZMPsweTjkzS4WAwsf95OOHdY
-jtBn5MEAFgiytdCV7SL7wTGfG4EZwnYSrcYNGzkSZf8lYOh7ZPJBqGCLQSYrG1CI
-aLadu1cmyQeFyH9ul0L3Jt7nUXqn41hJIxAhDHjW0Uk69uQZLnopF0drV8D5xyjv
-fwRQ
+HzAdBgNVBAMMFnNhbmRib3gyMy1hZG0uY2luZXMuZnIwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCsigP9Cr1IRN70GTxhIMmG7hYQjxL+cC1h55VVL++u
+3cEowzmq0LADzGpXvvHNUMnPV9BCy/g0vI6qQKTCricVTXKDwbb86uwWWUwdpQ6u
+NavOYsy6doFK/1TapbWehsSahtXecwfZxIqvNGFqNRfrTbh+hhsQfBcczVAbzuvA