Merge branch 'release/1.9.11' into develop

config/.gitignore

@@ -1,2 +1,3 @@
 /*.ear
 /*.jar
+/*.war

config/config.yaml

@@ -0,0 +1,74 @@
+name: ervu-account-applications-backend
+
+replicaCount: 1
+
+resources:
+  requests:
+    memory: '256Mi'
+    cpu: '50m'
+  limits:
+    memory: '2Gi'
+    cpu: '1'
+
+env:
+  - name: ERVU_URL
+    value: 'https://{{ $.Values.ingress_base_host }}'
+  - name: ERVU_PWD_SIGN_SECRET_KEY
+    value: 'DtCAQdeKnrAMLfdJkFVdfQnyT/Z5OINK4jqX0LbavfM='
+
+ports:
+  - name: http
+    containerPort: 8080
+
+services:
+  - name: '{{ $.Values.name }}'
+    type: ClusterIP
+    ports:
+      - name: http
+        port: 80
+        targetPort: 8080
+
+postgres:
+  database: 'ervu_account_applications'
+
+livenessProbe:
+  failureThreshold: 3
+  httpGet:
+    path: /
+    port: 8080
+  initialDelaySeconds: 30
+  periodSeconds: 3
+  successThreshold: 1
+  timeoutSeconds: 5
+
+readinessProbe:
+  failureThreshold: 3
+  httpGet:
+    path: /account-applications/version
+    port: 8080
+  initialDelaySeconds: 30
+  periodSeconds: 3
+  successThreshold: 1
+  timeoutSeconds: 5
+
+ingress:
+- name: '{{ $.Values.name }}'
+  annotations:
+    nginx.ingress.kubernetes.io/affinity: 'cookie'
+    nginx.ingress.kubernetes.io/session-cookie-name: 'stickysession'
+    nginx.ingress.kubernetes.io/session-cookie-max-age: '7200'
+    nginx.ingress.kubernetes.io/proxy-body-size: "75m"
+    nginx.ingress.kubernetes.io/rewrite-target: /account-applications/$2
+  labels:
+    app/name: ervu-account-applications
+  rules:
+  - host: '{{ $.Values.ingress_base_host }}'
+    http:
+      paths:
+      - path: /mfe/account-applications/account-applications(/|$)(.*)
+        pathType: Prefix
+        backend:
+          service:
+            name: '{{ $.Values.name }}'
+            port:
+              name: http

config/entrypoint.sh

@@ -0,0 +1,6 @@
+#! /bin/bash
+
+. /etc/tomcat/tomcat.conf
+. /etc/sysconfig/tomcat
+
+/usr/libexec/tomcat/server start

config/settings.xml

@@ -0,0 +1,13 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                          https://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <mirrors>
+    <mirror>
+      <id>central-mirror</id>
+      <name>rtlabs-public</name>
+      <url>https://nexus-dev.pgs.rtlabs.ru/repository/maven-public</url>
+      <mirrorOf>*</mirrorOf>
+    </mirror>
+  </mirrors>
+</settings>

config/tomcat/etc/tomcat/conf.d/db.conf

@@ -1,8 +1,8 @@
 JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS \
- -Ddb.host=${DB_APP_HOST:-db} \
- -Ddb.port=${DB_APP_PORT:-5432} \
- -Ddb.name=${DB_APP_NAME:-app} \
- -Ddb.username=${DB_APP_USERNAME:-app_user} \
- -Ddb.password=${DB_APP_PASSWORD:-apppassword} \
+ -Ddb.host=\"${PG_HOST:-db}\" \
+ -Ddb.port=\"${PG_PORT:-5432}\" \
+ -Ddb.name=\"${PG_DATABASE:-app}\" \
+ -Ddb.username=\"${PG_USER:-app_user}\" \
+ -Ddb.password=\"${PG_PASSWORD:-apppassword}\" \
 "
-export JDK_JAVA_OPTIONS
+export JDK_JAVA_OPTIONS

config/tomcat/etc/tomcat/webbpm.properties

@@ -6,6 +6,7 @@ authentication.method=form
 bpmn.enable=false
 fias.enable=false
 gar.enable=false
+registration.enabled=false
 
 mail.jndi.resource.name=
 
@@ -16,4 +17,4 @@ webbpm.mode=production
 webbpm.jbpm.hibernate_statistics.enabled=false
 webbpm.cache.hazelcast.hosts=127.0.0.1
 webbpm.cache.hazelcast.outbound_port_definitions=5801-5820
-registration.enabled=false
+com.amazonaws.sdk.disableCertChecking

config/uat/settings.xml

@@ -0,0 +1,13 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                          https://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <mirrors>
+    <mirror>
+      <id>central-mirror</id>
+      <name>rtlabs-public</name>
+      <url>http://nexus.gosuslugi.local/content/repositories/central</url>
+      <mirrorOf>*</mirrorOf>
+    </mirror>
+  </mirrors>
+</settings>