micord/ervu-eks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Maksim Tereshin 2024-11-21 12:22:10 +01:00
commit 44553497d2
No known key found for this signature in database
6 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config-data-executor/src/main/resources/application.yml
View file

@ -1 +1 @@
configDirectory: C:\work\ervu-secret\config\cde-xml
configDirectory: C:\work\ervu-eks\config\cde-xml

12
config/db.env
View file

@ -1,16 +1,16 @@
# App datasource
DB_APP_NAME=ervu-eks
DB_APP_NAME=ervu_eks
DB_APP_HOST=db
DB_APP_PORT=5432
DB_APP_USERNAME=ervu-eks
DB_APP_PASSWORD=ervu-eks
DB_APP_USERNAME=ervu_eks
DB_APP_PASSWORD=ervu_eks
# Security datasource
DB_SEC_NAME=ervu-eks
DB_SEC_NAME=ervu_eks
DB_SEC_HOST=db
DB_SEC_PORT=5432
DB_SEC_USERNAME=ervu-eks-sec
DB_SEC_PASSWORD=ervu-eks-sec
DB_SEC_USERNAME=ervu_eks_sec
DB_SEC_PASSWORD=ervu_eks_sec
# Person datasource
DB_PERSON_NAME=person_registry

14
config/initdb.d/createdb.sql
View file

@ -1,23 +1,23 @@
CREATE ROLE "ervu-eks" WITH
CREATE ROLE "ervu_eks" WITH
LOGIN
NOSUPERUSER
INHERIT
NOCREATEDB
NOCREATEROLE
NOREPLICATION
PASSWORD 'ervu-eks';
PASSWORD 'ervu_eks';
CREATE ROLE "ervu-eks-sec" WITH
CREATE ROLE "ervu_eks_sec" WITH
LOGIN
NOSUPERUSER
INHERIT
NOCREATEDB
NOCREATEROLE
NOREPLICATION
PASSWORD 'ervu-eks-sec';
PASSWORD 'ervu_eks_sec';
CREATE DATABASE "ervu-eks"
CREATE DATABASE "ervu_eks"
WITH
OWNER = "ervu-eks";
OWNER = "ervu_eks";
GRANT CREATE ON DATABASE "ervu-eks" TO "ervu-eks-sec";
GRANT CREATE ON DATABASE "ervu_eks" TO "ervu_eks_sec";

12
config/micord.env
View file

@ -1,18 +1,18 @@
TZ=Europe/Moscow
# App datasource
DB_APP_USERNAME=ervu-eks
DB_APP_PASSWORD=ervu-eks
DB_APP_USERNAME=ervu_eks
DB_APP_PASSWORD=ervu_eks
DB_APP_HOST=10.10.31.118
DB_APP_PORT=5432
DB_APP_NAME=ervu-eks
DB_APP_NAME=ervu_eks
# Security datasource
DB_SEC_USERNAME=ervu-eks-sec
DB_SEC_PASSWORD=ervu-eks-sec
DB_SEC_USERNAME=ervu_eks_sec
DB_SEC_PASSWORD=ervu_eks_sec
DB_SEC_HOST=10.10.31.118
DB_SEC_PORT=5432
DB_SEC_NAME=ervu-eks
DB_SEC_NAME=ervu_eks
# Person datasource
DB_PERSON_USERNAME=ervu

14
config/standalone.xml
View file

@ -58,7 +58,7 @@
<property name="config.data.executor.url" value="http://localhost:8080/config-data-executor/api"/>
<property name="config.data.executor.socket.timeout" value="10"/>
<property name="config.data.executor.connection.timeout" value="10"/>
<property name="configDirectory" value="C:\work\ervu-secret\config-data-executor\config-examples"/>
<property name="configDirectory" value="C:\work\ervu-eks\config-data-executor\config-examples"/>
</system-properties>
<management>
<audit-log>
@ -156,11 +156,11 @@
<xa-datasource jndi-name="java:/webbpm/AppDS" pool-name="AppDS" enabled="true" use-java-context="true">
<xa-datasource-property name="ServerName">10.10.31.118</xa-datasource-property>
<xa-datasource-property name="PortNumber">5432</xa-datasource-property>
<xa-datasource-property name="DatabaseName">ervu-eks</xa-datasource-property>
<xa-datasource-property name="DatabaseName">ervu_eks</xa-datasource-property>
<driver>postgresql</driver>
<security>
<user-name>ervu-eks</user-name>
<password>ervu-eks</password>
<user-name>ervu_eks</user-name>
<password>ervu_eks</password>
</security>
<validation>
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker" />
@ -173,11 +173,11 @@
<xa-datasource jndi-name="java:/webbpm/security-ds" pool-name="SECURITYDS" enabled="true" use-java-context="true">
<xa-datasource-property name="ServerName">10.10.31.118</xa-datasource-property>
<xa-datasource-property name="PortNumber">5432</xa-datasource-property>
<xa-datasource-property name="DatabaseName">ervu-eks</xa-datasource-property>
<xa-datasource-property name="DatabaseName">ervu_eks</xa-datasource-property>
<driver>postgresql</driver>
<security>
<user-name>ervu-eks-sec</user-name>
<password>ervu-eks-sec</password>
<user-name>ervu_eks_sec</user-name>
<password>ervu_eks_sec</password>
</security>
<validation>
<valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker" />

8
resources/src/main/resources/database/datasource.xml
View file

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<datasource>
<dbBeanPackage>ru.micord.ervu.eks.db_beans</dbBeanPackage>
<dbName>ervu-eks</dbName>
<dbName>ervu_eks</dbName>
<driverClassName>org.postgresql.Driver</driverClassName>
<host>10.10.31.118</host>
<manually>false</manually>
<password>ervu-eks</password>
<password>ervu_eks</password>
<port>5432</port>
<replicaJndiNames>java:/webbpm/personRegistryDS</replicaJndiNames>
<schemas>public</schemas>
<sqlDialect>POSTGRES</sqlDialect>
<url>jdbc:postgresql://10.10.31.118:5432/ervu-eks</url>
<url>jdbc:postgresql://10.10.31.118:5432/ervu_eks</url>
<urlPrefix>jdbc:postgresql:</urlPrefix>
<user>ervu-eks</user>
<user>ervu_eks</user>
</datasource>