ivan-igorevich/dc-observatio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config: адреса config-server и окружения на localhost

Browse Source 
application.yaml/yml всех сервисов и config-repo переведены с 192.168.60.x
на localhost (дефолты CONFIG_SERVER_URI и пр.); обновлены примеры в
changeIpInCurrentFolder.sh и create_pcp_databases.sh.
This commit is contained in:
Дмитрий Соловьев
2026-06-06 00:04:09 +03:00
parent 26bd1f111d
commit b454c01c09
18 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changeIpInCurrentFolder.sh
+1 -1
View File
@@ -3,7 +3,7 @@ set -euo pipefail
if [ "$#" -ne 2 ]; then if [ "$#" -ne 2 ]; then
echo "Usage: $0 <old-ip> <new-ip>" echo "Usage: $0 <old-ip> <new-ip>"
echo "Example: $0 192.168.60.201 192.168.60.201" echo "Example: $0 192.168.60.146 192.168.60.146"
exit 1 exit 1
fi fi
config-repo/application-dev.yaml
+4 -4
View File
@@ -1,16 +1,16 @@
# TODO before merge request: вернуть старые адреса окружения. # TODO before merge request: вернуть старые адреса окружения.
# pcp.infra.postgres.host: 192.168.60.201 # pcp.infra.postgres.host: 192.168.60.146
pcp: pcp:
infra: infra:
postgres: postgres:
host: 192.168.60.201 host: 192.168.60.146
port: 35400 port: 35400
kafka: kafka:
host: 192.168.60.201 host: 192.168.60.146
port: 19092 port: 19092
network: network:
host: 192.168.60.201 host: 192.168.60.146
ports: ports:
config: 8888 config: 8888
config-repo/application-docker-local.yaml
+1 -1
View File
@@ -56,7 +56,7 @@ spring:
camunda: camunda:
client: client:
enabled: ${CAMUNDA_CLIENT_ENABLED:false} 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: auth:
method: none method: none
prefer-rest-over-grpc: false prefer-rest-over-grpc: false
create_pcp_databases.sh
+1 -1
View File
@@ -3,7 +3,7 @@ set -euo pipefail
# PostgreSQL connection settings. Override via env if needed: # PostgreSQL connection settings. Override via env if needed:
# PGHOST=... PGPORT=... PGUSER=... PGPASSWORD=... ./create_pcp_databases.sh # PGHOST=... PGPORT=... PGUSER=... PGPASSWORD=... ./create_pcp_databases.sh
PGHOST="${PGHOST:-192.168.60.201}" PGHOST="${PGHOST:-192.168.60.146}"
PGPORT="${PGPORT:-5432}" PGPORT="${PGPORT:-5432}"
PGUSER="${PGUSER:-postgres}" PGUSER="${PGUSER:-postgres}"
PGPASSWORD="${PGPASSWORD:-password}" PGPASSWORD="${PGPASSWORD:-password}"
services/pcp-ballistics-service/src/main/resources/application.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:dev} label: ${SPRING_CLOUD_CONFIG_LABEL:dev}
services/pcp-complex-mission-service/src/main/resources/application.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:dev} label: ${SPRING_CLOUD_CONFIG_LABEL:dev}
services/pcp-coverage-scheme-service/src/main/resources/application.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:dev} label: ${SPRING_CLOUD_CONFIG_LABEL:dev}
services/pcp-dynamic-plan-service/src/main/resources/application.yaml
+2 -2
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:master} label: ${SPRING_CLOUD_CONFIG_LABEL:master}
@@ -15,7 +15,7 @@ spring:
# max-in-memory-size: 16MB # max-in-memory-size: 16MB
datasource: datasource:
driver-class-name: org.postgresql.Driver 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 username: postgres
password: password password: password
jpa: jpa:
services/pcp-mission-planing-service/src/main/resources/application.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:dev} label: ${SPRING_CLOUD_CONFIG_LABEL:dev}
services/pcp-request-service/src/main/resources/application.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:master} label: ${SPRING_CLOUD_CONFIG_LABEL:master}
services/pcp-route-processing-service/src/main/resources/application.yml
+2 -2
View File
@@ -7,13 +7,13 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:master} label: ${SPRING_CLOUD_CONFIG_LABEL:master}
datasource: datasource:
driver-class-name: org.postgresql.Driver 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} username: ${PCP_ROUTE_PROCESSING_DATASOURCE_USERNAME:postgres}
password: ${PCP_ROUTE_PROCESSING_DATASOURCE_PASSWORD:password} password: ${PCP_ROUTE_PROCESSING_DATASOURCE_PASSWORD:password}
jpa: jpa:
services/pcp-satellite-catalog-service/src/main/resources/application.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:dev} label: ${SPRING_CLOUD_CONFIG_LABEL:dev}
services/pcp-srpring-boot-admin-server/src/main/resources/application.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:dev} label: ${SPRING_CLOUD_CONFIG_LABEL:dev}
services/pcp-stations-service/src/main/resources/application.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:master} label: ${SPRING_CLOUD_CONFIG_LABEL:master}
services/pcp-tgu-service/src/main/resources/application.yml
+1 -1
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:master} label: ${SPRING_CLOUD_CONFIG_LABEL:master}
services/pcp-ui-service/src/main/resources/application.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:dev} label: ${SPRING_CLOUD_CONFIG_LABEL:dev}
services/slots-service/src/main/resources/application.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:dev} label: ${SPRING_CLOUD_CONFIG_LABEL:dev}
services/tle-monitoring-service/src/main/resources/application.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ spring:
import: "configserver:" import: "configserver:"
cloud: cloud:
config: 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} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true}
profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}}
label: ${SPRING_CLOUD_CONFIG_LABEL:dev} label: ${SPRING_CLOUD_CONFIG_LABEL:dev}