summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xhetzner-admin/install.sh2
-rw-r--r--vpn/install.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/hetzner-admin/install.sh b/hetzner-admin/install.sh
index f175cf9..360424d 100755
--- a/hetzner-admin/install.sh
+++ b/hetzner-admin/install.sh
@@ -28,4 +28,4 @@ fi
chmod +x "$(pwd)/run-command.sh"
-docker compose up -d --build
+bash "$(pwd)/deploy.sh"
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 起動完了 ==="