From ed78863260dedd56152976ebc630229461e2b0a2 Mon Sep 17 00:00:00 2001
From: yyamashita <yyamashita@hetzner.yyamashita.com>
Date: Mon, 1 Jun 2026 21:19:05 +0900
Subject: Fix DKIM key generation: use host opendkim-tools instead of Docker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ubuntu 24.04 ホストに直接 apt install して opendkim-genkey を実行する。
Debian Bookworm の Docker 内では OpenSSL 3.x 互換性問題で失敗するため。
setup-route53.py: ホストゾーン自動検出・SERVER_IP 自動取得を追加。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 mail/install.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'mail/install.sh')

diff --git a/mail/install.sh b/mail/install.sh
index a913938..8f57c7d 100755
--- a/mail/install.sh
+++ b/mail/install.sh
@@ -32,19 +32,18 @@ chmod 700 "$KEY_DIR"
 if [[ -f "$KEY_DIR/${SELECTOR}.private" ]]; then
     echo "  既存の鍵を使用: $KEY_DIR/${SELECTOR}.private"
 else
+    echo "  opendkim-tools をインストール..."
+    DEBIAN_FRONTEND=noninteractive apt-get install -y -qq opendkim-tools
     echo "  2048bit RSA 鍵を生成中..."
-    docker run --rm -v "${KEY_DIR}:/keys" debian:bookworm-slim bash -c "
-        apt-get update -qq && apt-get install -y -qq opendkim-tools 2>/dev/null
-        cd /keys && opendkim-genkey -b 2048 -s ${SELECTOR} -d yyamashita.com
-        chmod 600 /keys/${SELECTOR}.private
-    "
+    cd "$KEY_DIR"
+    opendkim-genkey -b 2048 -s "$SELECTOR" -d yyamashita.com
+    chmod 600 "$KEY_DIR/${SELECTOR}.private"
     echo "  生成完了"
 fi
 
 # OpenDKIM テーブル生成
 echo ""
 echo "=== OpenDKIM テーブル生成 ==="
-mkdir -p "$OPENDKIM_DIR"
 
 {
     for d in "${SERVICE_DOMAINS[@]}"; do
-- 
cgit v1.2.3