Centralize repo and hook management: add repos.txt and install.sh

All bare repo creation is now driven by repos.txt in this repo.
install.sh replaces install-hooks.sh and handles both repo creation
and hook deployment. Other repos' server-setup.sh no longer manage
bare repos or hooks.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

2 files changed, 56 insertions, 16 deletions

diff --git a/scripts/install-hooks.sh b/scripts/install.sh
index c502496..9f06489 100755
--- a/scripts/install-hooks.sh
+++ b/scripts/install.sh
@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 # サーバー上で root として手動実行する
-# server-hooks/ の内容を /var/git/*/hooks/ に展開する
+# repos.txt に基づいてベアリポジトリとワークツリーを作成し、
+# server-hooks/ のフックを /var/git/*/hooks/ に展開する
 set -euo pipefail
 
 APP_DIR="$(cd "$(dirname "$0")/.." && pwd)"
+REPOS_FILE="$APP_DIR/repos.txt"
 HOOKS_SRC="$APP_DIR/server-hooks"
 
 if [[ "$(id -u)" -ne 0 ]]; then
@@ -11,12 +13,35 @@ if [[ "$(id -u)" -ne 0 ]]; then
     exit 1
 fi
 
+# ベアリポジトリ・ワークツリー作成
+echo "=== Repositories ==="
+while IFS=: read -r repo_name work_tree; do
+    [[ "$repo_name" =~ ^#.*$ || -z "$repo_name" ]] && continue
+    bare_repo="/var/git/${repo_name}.git"
+
+    if [[ ! -d "$bare_repo" ]]; then
+        echo "  create: $bare_repo"
+        mkdir -p "$bare_repo"
+        git init --bare "$bare_repo"
+    else
+        echo "  exists: $bare_repo"
+    fi
+
+    if [[ ! -d "$work_tree" ]]; then
+        echo "  mkdir:  $work_tree"
+        mkdir -p "$work_tree"
+    fi
+done < "$REPOS_FILE"
+
+# フック展開
+echo ""
+echo "=== Hooks ==="
 for repo_src in "$HOOKS_SRC"/*/; do
     repo_name="$(basename "$repo_src")"
     git_hooks_dir="/var/git/${repo_name}.git/hooks"
 
     if [[ ! -d "$git_hooks_dir" ]]; then
-        echo "SKIP: $git_hooks_dir が存在しません ($repo_name)"
+        echo "  SKIP: $git_hooks_dir not found ($repo_name)"
         continue
     fi
 
@@ -33,4 +58,5 @@ for repo_src in "$HOOKS_SRC"/*/; do
     done
 done
 
+echo ""
 echo "Done."
diff --git a/scripts/server-setup.sh b/scripts/server-setup.sh
index 154c6c7..ca9a3f9 100644
--- a/scripts/server-setup.sh
+++ b/scripts/server-setup.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
-# Run once on a fresh Hetzner VPS (as root). Run this first before other app setups.
+# Run once on a fresh Hetzner VPS (as root).
+# hetzner-infra のみブートストラップとして作成する。
+# 他のリポジトリは最初の push 後に install.sh が作成する。
 set -e
 
-APP_DIR=/app/infra
 REPO_DIR=/var/git/hetzner-infra.git
+APP_DIR=/app/infra
 
 # Install Docker
 curl -fsSL https://get.docker.com | sh
@@ -11,18 +13,30 @@ curl -fsSL https://get.docker.com | sh
 # Create shared Docker network
 docker network create web || true
 
-mkdir -p "$APP_DIR"
-mkdir -p "$REPO_DIR"
+# hetzner-infra bare repo をブートストラップ
+mkdir -p "$REPO_DIR" "$APP_DIR"
 git init --bare "$REPO_DIR"
 
+# 最初の push を受け取るための最小限のフック（install.sh 実行後に上書きされる）
+cat > "$REPO_DIR/hooks/post-receive" << 'HOOK'
+#!/bin/bash
+set -e
+APP_DIR=/app/infra
+GIT_WORK_TREE=$APP_DIR git checkout -f
+cd $APP_DIR
+docker network create web 2>/dev/null || true
+docker compose up -d
+docker compose exec -T caddy caddy reload --config /etc/caddy/Caddyfile 2>/dev/null || true
+echo "Deploy complete: hetzner-infra"
+if [ -f "$APP_DIR/scripts/sync-claude-services.sh" ]; then
+    bash "$APP_DIR/scripts/sync-claude-services.sh"
+fi
+HOOK
+chmod +x "$REPO_DIR/hooks/post-receive"
+
 echo ""
-echo "Setup complete. On your local machine, run:"
-echo "  git remote add hetzner root@<server-ip>:$REPO_DIR"
-echo "  git push hetzner master"
-echo ""
-echo "Then install hooks:"
-echo "  ssh root@<server-ip> 'bash /app/infra/scripts/install-hooks.sh'"
-echo ""
-echo "Then run setup scripts for each app:"
-echo "  tokyo-livehouse-events/scripts/server-setup.sh"
-echo "  whois-band/scripts/server-setup.sh"
+echo "Next steps:"
+echo "  1. git remote add origin root@<server-ip>:$REPO_DIR"
+echo "  2. git push origin master"
+echo "  3. ssh root@<server-ip> 'bash $APP_DIR/scripts/install.sh'"
+echo "     (他のリポジトリ作成 + 全フックの正式インストール)"