From 7be614fa7aa9672e0ebe0424be2e3dae88c75c83 Mon Sep 17 00:00:00 2001 From: yyamashita Date: Thu, 2 Jul 2026 13:14:11 +0900 Subject: Unify install.sh pattern: always delegate to deploy.sh Both hetzner-admin and vpn install.sh were calling docker compose directly instead of going through their own deploy.sh, unlike mail which already followed the correct pattern. Co-Authored-By: Claude Sonnet 4.6 --- vpn/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vpn') diff --git a/vpn/install.sh b/vpn/install.sh index 42088c0..0198396 100644 --- a/vpn/install.sh +++ b/vpn/install.sh @@ -45,15 +45,15 @@ awk '/BEGIN CERTIFICATE/{n++} n==1' "$CERT_DIR/server.crt" > "$CERT_DIR/server-l awk '/BEGIN CERTIFICATE/{n++} n>1' "$CERT_DIR/server.crt" > "$CERT_DIR/server-chain.crt" mv "$CERT_DIR/server-leaf.crt" "$CERT_DIR/server.crt" -# Android 用 CA 証明書 (YE1 中間 CA) を Caddy で配信 +# 中間 CA 証明書を Caddy で配信（クライアントが手動インストールする場合に使用） awk '/BEGIN CERTIFICATE/{n++} n==1' "$CERT_DIR/server-chain.crt" > "$CADDY_DIR/ca.pem" -echo "Android 用 CA 証明書を ${CADDY_DIR}/ca.pem に配置しました。" +echo "中間 CA 証明書を ${CADDY_DIR}/ca.pem に配置しました。" echo "証明書を $CERT_DIR/ に保存しました。" # VPN コンテナ起動 echo "VPN サービスを起動中..." -docker compose up -d --build +bash "$(pwd)/deploy.sh" echo "" echo "=== VPN 起動完了 ===" -- cgit v1.2.3