diff --git a/changeIpInCurrentFolder.sh b/changeIpInCurrentFolder.sh index 68bcff2..a130d41 100755 --- a/changeIpInCurrentFolder.sh +++ b/changeIpInCurrentFolder.sh @@ -3,7 +3,7 @@ set -euo pipefail if [ "$#" -ne 2 ]; then echo "Usage: $0 " - echo "Example: $0 192.168.60.201 192.168.60.201" + echo "Example: $0 192.168.60.146 192.168.60.146" exit 1 fi diff --git a/config-repo/application-dev.yaml b/config-repo/application-dev.yaml index 4e14ccd..288ae0c 100644 --- a/config-repo/application-dev.yaml +++ b/config-repo/application-dev.yaml @@ -1,16 +1,16 @@ # TODO before merge request: вернуть старые адреса окружения. -# pcp.infra.postgres.host: 192.168.60.201 +# pcp.infra.postgres.host: 192.168.60.146 pcp: infra: postgres: - host: 192.168.60.201 + host: 192.168.60.146 port: 35400 kafka: - host: 192.168.60.201 + host: 192.168.60.146 port: 19092 network: - host: 192.168.60.201 + host: 192.168.60.146 ports: config: 8888 diff --git a/config-repo/application-docker-local.yaml b/config-repo/application-docker-local.yaml index 1e6e8f9..eb1019f 100644 --- a/config-repo/application-docker-local.yaml +++ b/config-repo/application-docker-local.yaml @@ -56,7 +56,7 @@ spring: camunda: client: enabled: ${CAMUNDA_CLIENT_ENABLED:false} - grpc-address: ${CAMUNDA_GRPC_ADDRESS:http://192.168.60.201:26500} + grpc-address: ${CAMUNDA_GRPC_ADDRESS:http://192.168.60.146:26500} auth: method: none prefer-rest-over-grpc: false diff --git a/create_pcp_databases.sh b/create_pcp_databases.sh index 0cc247a..cf62fea 100755 --- a/create_pcp_databases.sh +++ b/create_pcp_databases.sh @@ -3,7 +3,7 @@ set -euo pipefail # PostgreSQL connection settings. Override via env if needed: # PGHOST=... PGPORT=... PGUSER=... PGPASSWORD=... ./create_pcp_databases.sh -PGHOST="${PGHOST:-192.168.60.201}" +PGHOST="${PGHOST:-192.168.60.146}" PGPORT="${PGPORT:-5432}" PGUSER="${PGUSER:-postgres}" PGPASSWORD="${PGPASSWORD:-password}" diff --git a/services/pcp-ballistics-service/src/main/resources/application.yaml b/services/pcp-ballistics-service/src/main/resources/application.yaml index ae41013..973f1d2 100644 --- a/services/pcp-ballistics-service/src/main/resources/application.yaml +++ b/services/pcp-ballistics-service/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:dev} diff --git a/services/pcp-complex-mission-service/src/main/resources/application.yaml b/services/pcp-complex-mission-service/src/main/resources/application.yaml index 7043a07..20b63ff 100644 --- a/services/pcp-complex-mission-service/src/main/resources/application.yaml +++ b/services/pcp-complex-mission-service/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:dev} diff --git a/services/pcp-coverage-scheme-service/src/main/resources/application.yaml b/services/pcp-coverage-scheme-service/src/main/resources/application.yaml index 67f8611..e07ab9f 100644 --- a/services/pcp-coverage-scheme-service/src/main/resources/application.yaml +++ b/services/pcp-coverage-scheme-service/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:dev} diff --git a/services/pcp-dynamic-plan-service/src/main/resources/application.yaml b/services/pcp-dynamic-plan-service/src/main/resources/application.yaml index a4613fe..3130095 100644 --- a/services/pcp-dynamic-plan-service/src/main/resources/application.yaml +++ b/services/pcp-dynamic-plan-service/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:master} @@ -15,7 +15,7 @@ spring: # max-in-memory-size: 16MB datasource: driver-class-name: org.postgresql.Driver - url: jdbc:postgresql://192.168.60.201:5432/complan + url: jdbc:postgresql://${PCP_POSTGRES_HOST:localhost}:${PCP_POSTGRES_PORT:5432}/complan username: postgres password: password jpa: diff --git a/services/pcp-mission-planing-service/src/main/resources/application.yaml b/services/pcp-mission-planing-service/src/main/resources/application.yaml index 71fadd4..33c1a3b 100644 --- a/services/pcp-mission-planing-service/src/main/resources/application.yaml +++ b/services/pcp-mission-planing-service/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:dev} diff --git a/services/pcp-request-service/src/main/resources/application.yaml b/services/pcp-request-service/src/main/resources/application.yaml index 50f2cbc..c3632e3 100644 --- a/services/pcp-request-service/src/main/resources/application.yaml +++ b/services/pcp-request-service/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:master} diff --git a/services/pcp-route-processing-service/src/main/resources/application.yml b/services/pcp-route-processing-service/src/main/resources/application.yml index ee74539..0d1f387 100644 --- a/services/pcp-route-processing-service/src/main/resources/application.yml +++ b/services/pcp-route-processing-service/src/main/resources/application.yml @@ -7,13 +7,13 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:master} datasource: driver-class-name: org.postgresql.Driver - url: ${PCP_ROUTE_PROCESSING_DATASOURCE_URL:jdbc:postgresql://${PCP_POSTGRES_HOST:192.168.60.201}:${PCP_POSTGRES_PORT:5432}/pcp_route_processing} + url: ${PCP_ROUTE_PROCESSING_DATASOURCE_URL:jdbc:postgresql://${PCP_POSTGRES_HOST:localhost}:${PCP_POSTGRES_PORT:5432}/pcp_route_processing} username: ${PCP_ROUTE_PROCESSING_DATASOURCE_USERNAME:postgres} password: ${PCP_ROUTE_PROCESSING_DATASOURCE_PASSWORD:password} jpa: diff --git a/services/pcp-satellite-catalog-service/src/main/resources/application.yaml b/services/pcp-satellite-catalog-service/src/main/resources/application.yaml index b361978..370d5bd 100644 --- a/services/pcp-satellite-catalog-service/src/main/resources/application.yaml +++ b/services/pcp-satellite-catalog-service/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:dev} diff --git a/services/pcp-srpring-boot-admin-server/src/main/resources/application.yaml b/services/pcp-srpring-boot-admin-server/src/main/resources/application.yaml index 5c5e7cc..bcdb4e8 100644 --- a/services/pcp-srpring-boot-admin-server/src/main/resources/application.yaml +++ b/services/pcp-srpring-boot-admin-server/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:dev} diff --git a/services/pcp-stations-service/src/main/resources/application.yaml b/services/pcp-stations-service/src/main/resources/application.yaml index d70b9b3..3609f1e 100644 --- a/services/pcp-stations-service/src/main/resources/application.yaml +++ b/services/pcp-stations-service/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:master} diff --git a/services/pcp-tgu-service/src/main/resources/application.yml b/services/pcp-tgu-service/src/main/resources/application.yml index 72eb041..d6dd150 100644 --- a/services/pcp-tgu-service/src/main/resources/application.yml +++ b/services/pcp-tgu-service/src/main/resources/application.yml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:master} diff --git a/services/pcp-ui-service/src/main/resources/application.yaml b/services/pcp-ui-service/src/main/resources/application.yaml index f4d3e2c..78562ba 100644 --- a/services/pcp-ui-service/src/main/resources/application.yaml +++ b/services/pcp-ui-service/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:dev} diff --git a/services/slots-service/src/main/resources/application.yaml b/services/slots-service/src/main/resources/application.yaml index 1195f0d..c40df22 100644 --- a/services/slots-service/src/main/resources/application.yaml +++ b/services/slots-service/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:dev} diff --git a/services/tle-monitoring-service/src/main/resources/application.yaml b/services/tle-monitoring-service/src/main/resources/application.yaml index d73e9a2..8a2dbbc 100644 --- a/services/tle-monitoring-service/src/main/resources/application.yaml +++ b/services/tle-monitoring-service/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} + uri: ${CONFIG_SERVER_URI:http://localhost:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:dev}