Server和client部署整理

deploy/bird/.env

@@ -2,7 +2,7 @@
 RPKI_BIRD_VERSION=3.2.1
 
 # TCP mode target endpoint.
-RPKI_BIRD_RPKI_HOST=rpki-rtr-tcp
+RPKI_BIRD_RPKI_HOST=rpki-rtr
 RPKI_BIRD_RPKI_PORT=323
 
 # SSH mode target endpoint.
@@ -30,4 +30,4 @@ RPKI_BIRD_SHOW_ROA6=1
 
 # Host volume mounts.
 RPKI_BIRD_LOG_HOST_DIR=../../logs/bird
-RPKI_BIRD_SSH_CERTS_HOST_DIR=../../certs
+RPKI_BIRD_SSH_CERTS_HOST_DIR=../../certs/ssh

deploy/bird/README.md

@@ -82,7 +82,7 @@ docker logs -f bird-rpki-client
   `OBSERVE_DEBOUNCE_SECS` (default `1`),
   `OBSERVE_INTERVAL` (seconds, used when `OBSERVE_MODE=interval`),
   and `OBSERVE_PROTO`.
-- SSH mode mounts `../../certs` into `/config/ssh` and expects:
+- SSH mode mounts `../../certs/ssh` into `/config/ssh` and expects:
   `bird-rtr-client.pem` and `ssh_host_rsa_key.pub`.
 - Entrypoint auto-generates `/run/bird/known_hosts` from
   `/config/ssh/ssh_host_rsa_key.pub` for BIRD SSH host-key verification.

deploy/bird/README.zh.md

@@ -73,7 +73,7 @@ docker logs -f bird-rpki-client
 
 - 当前 compose 使用 `network_mode: host`，默认通过 `host.docker.internal` 访问 server。
 - 观测频率由环境变量控制：`OBSERVE_INTERVAL`（秒，默认 `30`）和 `OBSERVE_PROTO`。
-- SSH 模式会将 `../../certs` 挂载到容器 `/config/ssh`，并使用：
+- SSH 模式会将 `../../certs/ssh` 挂载到容器 `/config/ssh`，并使用：
   `bird-rtr-client.pem`、`ssh_host_rsa_key.pub`。
 - 入口脚本会基于 `/config/ssh/ssh_host_rsa_key.pub` 自动生成
   `/run/bird/known_hosts`，用于 BIRD 的 SSH 主机密钥校验。

deploy/bird/docker-compose.ssh.yml

@@ -7,7 +7,7 @@ services:
       OBSERVE_PROTO: "rpki_ssh"
     volumes:
       - ./bird.conf.ssh.template:/config/bird.conf.ssh.template:ro
-      - ${RPKI_BIRD_SSH_CERTS_HOST_DIR:-../../certs}:/config/ssh:ro
+      - ${RPKI_BIRD_SSH_CERTS_HOST_DIR:-../../certs/ssh}:/config/ssh:ro
     networks:
       - rpki_net
 

deploy/bird/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     environment:
       BIRD_CONFIG_TEMPLATE_PATH: "${RPKI_BIRD_CONFIG_TEMPLATE_PATH:-/config/bird.conf.template}"
 
-      RPKI_HOST: "${RPKI_BIRD_RPKI_HOST:-rpki-rtr-tcp}"
+      RPKI_HOST: "${RPKI_BIRD_RPKI_HOST:-rpki-rtr}"
       RPKI_PORT: "${RPKI_BIRD_RPKI_PORT:-323}"
 
       OBSERVE_PROTO: "${RPKI_BIRD_OBSERVE_PROTO:-rpki_tcp}"