Merge branch 'prod' into 'master'

Prod See merge request documentale/sprint-flows!481
consiglionazionaledellericerche · Jan 13, 2020 · 6368d6d · 6368d6d
2 parents 21af92f + 0ac2ed2
commit 6368d6d
Show file tree

Hide file tree

Showing 7 changed files with 492 additions and 15 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -44,8 +44,9 @@ deploy_snapshot:
   only:
     - test
     - demo
+    - prod
   script:
-    - mvn -B clean compile package deploy -DskipTests -Pprod
+    - mvn -B clean compile package -DskipTests -Pprod
     - cp ./target/*.war ./target/app.war
 
 buildtestcontainer:
@@ -111,9 +112,7 @@ buildprodcontainer:
   tags:
     - shared
   only:
-    - /^(\d+\.)?(\d+\.)?(\*|\d+)$/
-  except:
-    - branches
+    - prod
   script:
     - echo "Running build image and push image for release tag"
     - echo $CI_COMMIT_REF_NAME
@@ -127,28 +126,25 @@ buildprodcontainer:
     - docker push $DOCKER_HUB_ORGANIZATION/$CI_PROJECT_NAME:latest
 
 
-
 deploydockprod01:
   stage: deploy_prod_container
   image: scolagreco/alpine-ssh:latest
   only:
-    - /^(\d+\.)?(\d+\.)?(\*|\d+)$/
-  except:
-    - branches
+    - prod
   tags:
     - shared
   when: manual
   script:
     - echo "Deploy sprint-flows to dockprod01"
     - echo "setting secrets"
-    - sed -i "s/docker.si.cnr.it\/sprint-flows/docker.si.cnr.it\/sprint-flows:$CI_COMMIT_TAG/g" ./src/main/docker/app-prod.yml
+    - sed -i "s/docker.si.cnr.it\/sprint-flows/docker.si.cnr.it\/sprint-flows:latest/g" ./src/main/docker/app-prod.yml
     - sed -i "s/SPRING_DATASOURCE_PASSWORD_SED/$POSTGRESS_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/SPRING_LDAP_MANAGERPASSWORD_SED/$LDAP_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/ACE_PASSWORD_SED/$ACE_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/CMIS_PASSWORD/$CMIS_PASSWORD/g" ./src/main/docker/app-prod.yml
     - echo "stopping service"
-    - sshremote $SSH_CONNECT_DOCPROD01 "if [ -f  ''/sites/docker-flows/app.yml'' ]; then docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down --remove-orphans; fi && rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/ || echo NODIR"
-    - echo "copying docker-compose file"
+    - sshremote $SSH_CONNECT_DOCPROD01 "docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down -v --remove-orphans || echo NOFILE"
+    - sshremote $SSH_CONNECT_DOCPROD01 "rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/"    - echo "copying docker-compose file"
     - scpremote ./src/main/docker/app-prod.yml $SSH_CONNECT_DOCPROD01:/sites/docker-flows/app.yml
     - echo "starting service"
     - sshremote $SSH_CONNECT_DOCPROD01 "docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml pull && docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml up -d"
@@ -160,9 +156,9 @@ deploydockprod02:
   stage: deploy_prod_container
   image: scolagreco/alpine-ssh:latest
   only:
-    - /^(\d+\.)?(\d+\.)?(\*|\d+)$/
-  except:
-    - branches
+    - prod
+  tags:
+    - shared
   when: manual
   script:
     - echo "Deploy sprint-flows to dockprod02"
@@ -173,11 +169,13 @@ deploydockprod02:
     - sed -i "s/ACE_PASSWORD_SED/$ACE_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/CMIS_PASSWORD/$CMIS_PASSWORD/g" ./src/main/docker/app-prod.yml
     - echo "stopping service"
-    - sshremote $SSH_CONNECT_DOCPROD02 "if [ -f  ''/sites/docker-flows/app.yml'' ]; then docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down --remove-orphans; fi && rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/ || echo NODIR"
+    - sshremote $SSH_CONNECT_DOCPROD02 "docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down -v --remove-orphans || echo NOFILE"
+    - sshremote $SSH_CONNECT_DOCPROD02 "rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/"
     - echo "copying docker-compose file"
     - scpremote ./src/main/docker/app-prod.yml $SSH_CONNECT_DOCPROD02:/sites/docker-flows/app.yml
     - echo "starting services"
     - sshremote $SSH_CONNECT_DOCPROD02 "docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml pull && docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml up -d"
   environment:
     name: dockprod02
     url: http://dockprod02.cedrc.cnr.it:1480
+
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
@@ -3,6 +3,8 @@ FROM scolagreco/alpine-openjdk:v3.9.2
 VOLUME /tmp
 
 RUN apk add --update --no-cache ttf-dejavu curl
+ARG JAR_FILE=./target/app.war
+ADD ${JAR_FILE} /opt/app.war
 
 EXPOSE 8080
 

diff --git a/src/main/resources/config/application-demo.yml b/src/main/resources/config/application-demo.yml
@@ -0,0 +1,88 @@
+spring:
+  ldap:
+    userSearchBase: o=cnr, c=it
+    userSearchFilter: uid={0}
+    url: ldap://virtest1.si.cnr.it:389
+    managerDn: cn=mastercnrapp2,ou=account,o=cnr,c=it
+    managerPassword: pippa
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    # l'url del db viene modificata all'avvio dell'applicazione a seconda del profilo (cnr => flows-cnr,
+    # oiv => flows-oiv) in modo che l'applicazione punti un db diverso a seconda del profilo
+    url: jdbc:postgresql://localhost:5432/flows
+    username: activiti
+    password: activitipw
+  jpa:
+    database-platform: it.cnr.si.domain.util.FixedPostgreSQL82Dialect
+    database: POSTGRESQL
+    show-sql: false
+  proxy:
+    OIL:
+      username: admin
+      password: ubiquitous
+      url: http://helpwildfly.si.cnr.it:8080/rest/
+      newProblem: pest
+      instance: /HDSiper
+  mail:
+    url: "https://demoscrivaniadigitale-cnr.si.cnr.it"
+
+cnr:
+  firma:
+    signcertid: AS0
+    typeotpauth: firma
+    url: http://arss.cedrc.cnr.it:8080/ArubaSignService/ArubaSignService?wsdl
+    pdfprofile: PADESBES
+  sigla:
+    usr: app.scrivaniadigitale
+    psw: bubbazza
+  coolflows:
+    username: utente1
+    password: HggHjhUIuhedfwUI788yasdfiuh897
+oiv:
+  baseurl: http://cool-jconon-funzione-pubblica.test.si.cnr.it
+  esperienza-noncoerente: ${oiv.baseurl}/rest/application-fp/esperienza-noncoerente
+  ricalcola-fascia: ${oiv.baseurl}/rest/application-fp/applications-ricalcola-fascia
+  iscrivi-inelenco: ${oiv.baseurl}/rest/application-fp/iscrivi-inelenco
+  soccorso-istruttorio: ${oiv.baseurl}/rest/application-fp/soccorso-istruttorio
+  preavviso-rigetto: ${oiv.baseurl}/rest/application-fp/preavviso-rigetto
+  comunicazioni: ${oiv.baseurl}/rest/application-fp/comunicazioni
+  usr: admin
+  psw: admin
+  mail:
+    mail.host: servizi.palazzochigi.it
+    mail.protocol: smtp
+    mail.port: 587
+    mail.user: elenco.oiv
+    mail.password: elencooiv2016
+    mail.send.error.to: [email protected]
+    mail.from: no-reply@scrivaniadigitale
+
+
+jhipster:
+  swagger:
+    title: sprint API
+    description: sprint API documentation
+    version: 0.0.1
+    termsOfServiceUrl:
+    contactName:
+    contactUrl:
+    contactEmail:
+    license:
+    licenseUrl:
+jasper-report:
+  dir-oiv: /src/main/resources/print/oiv-print/
+  dir-cnr: /src/main/resources/print/cnr-print/
+
+
+ace:
+  url: "http://acebuntudock.si.cnr.it:5555/api"
+  username: app.scrivaniadigitale
+  password: bubbazza
+
+# TODO: da modificare
+#repository:
+#  base:
+#    url: http://as1dock.si.cnr.it:8080/alfresco/
+
+#cache.hazelcast.port: 5709
+#cache.hazelcast.packages: it.cnr.si
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
@@ -0,0 +1,80 @@
+spring:
+  ldap:
+    userSearchBase: o=cnr, c=it
+    userSearchFilter: uid={0}
+    url: ldap://virtest1.si.cnr.it:389
+    managerDn: cn=mastercnrapp2,ou=account,o=cnr,c=it
+    managerPassword: pippa
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    # l'url del db viene modificata all'avvio dell'applicazione a seconda del profilo (cnr => flows-cnr,
+    # oiv => flows-oiv) in modo che l'applicazione punti un db diverso a seconda del profilo
+    url: jdbc:h2:file:./DB-H2/flows;DB_CLOSE_DELAY=-1
+    username: flows
+    password:
+  jpa:
+    database-platform: it.cnr.si.domain.util.FixedH2Dialect
+    database: H2
+    show-sql: false
+  proxy:
+    OIL:
+      username: admin
+      password: ubiquitous
+      url: http://helpwildfly.si.cnr.it:8080/rest/
+      newProblem: pest
+      instance: /HDSiper
+  mail:
+    url: localhost:8080
+
+cnr:
+  sigla:
+    usr: app.scrivaniadigitale
+    psw: bubbazza
+  mail:
+    mail.host: smtp.cnr.it
+    mail.protocol: smtp
+    mail.port: 25
+    mail.send.error.to: [email protected]
+    mail.from: no-reply@nuovascrivaniadigitale
+  abil:
+    url: http://dockerwebtest01.si.cnr.it:8088/
+
+oiv:
+  baseurl: http://cool-jconon-funzione-pubblica.test.si.cnr.it
+  esperienza-noncoerente: ${oiv.baseurl}/rest/application-fp/esperienza-noncoerente
+  ricalcola-fascia: ${oiv.baseurl}/rest/application-fp/applications-ricalcola-fascia
+  iscrivi-inelenco: ${oiv.baseurl}/rest/application-fp/iscrivi-inelenco
+  soccorso-istruttorio: ${oiv.baseurl}/rest/application-fp/soccorso-istruttorio
+  preavviso-rigetto: ${oiv.baseurl}/rest/application-fp/preavviso-rigetto
+  comunicazioni: ${oiv.baseurl}/rest/application-fp/comunicazioni
+  usr: admin
+  psw: admin
+  mail:
+    mail.host: servizi.palazzochigi.it
+    mail.protocol: smtp
+    mail.port: 587
+    mail.user: elenco.oiv
+    mail.password: elencooiv2016
+    mail.send.error.to: [email protected]
+    mail.from: no-reply@scrivaniadigitale
+
+
+jhipster:
+  swagger:
+    title: sprint API
+    description: sprint API documentation
+    version: 0.0.1
+    termsOfServiceUrl:
+    contactName:
+    contactUrl:
+    contactEmail:
+    license:
+    licenseUrl:
+jasper-report:
+  dir-oiv: /src/main/resources/print/oiv-print/
+  dir-cnr: /src/main/resources/print/cnr-print/
+
+ace:
+  url: "http://acebuntudock.si.cnr.it:5555/api"
+  username: app.scrivaniadigitale
+  password: bubbazza
diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml
@@ -0,0 +1,51 @@
+cache:
+  hazelcast:
+    mancenter:
+    port: 1481
+    outboundPort: 1482
+
+# inizio credenziali Alfresco
+user:
+  admin:
+    username: app.scrivaniadigitale
+    password:
+# fine credenziali Alfresco
+
+repository:
+  base:
+    url: https://gestdoc.cnr.it/alfresco/
+
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    # l'url del db viene modificata all'avvio dell'applicazione a seconda del profilo (cnr => flows-cnr,
+    # oiv => flows-oiv) in modo che l'applicazione punti un db diverso a seconda del profilo
+    url: jdbc:postgresql://fullhostdb.src.cnr.it:5432/flows
+    username: flows-cnr
+    password:
+  jpa:
+    database-platform: it.cnr.si.domain.util.FixedPostgreSQL82Dialect
+    database: POSTGRESQL
+    show-sql: false
+  proxy:
+    OIL:
+      username: admin
+      password: ubiquitous
+      url: http://helpwildfly.si.cnr.it:8080/rest/
+      newProblem: pest
+      instance: /HDSiper
+  ldap:
+    url: ldap://as11.cedrc.cnr.it:389
+    managerDn: cn=mastercnrapp8,ou=account,o=CNR,c=it
+    managerPassword:
+  mail:
+    url: "https://nuovascrivaniadigitale.cnr.it"
+
+ace:
+  url: https://api.ace.cnr.it/api/
+  username: app.scrivaniadigitale
+  password:
+
+cnr:
+  abil:
+    url: https://attivitainternazionali.cnr.it