リダイレクトルールを追加

This reverts commit 337f3780a2.

docker/catmario/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   catmario:
-    image: nginx:1.25.5
+    image: nginx:1.26.2
     networks:
       - default
       - traefik

docker/eaglercraft/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   eaglercraft:
-    image: nginx:1.25.5
+    image: nginx:1.26.2
     networks:
       - default
       - traefik

docker/space-cadet-pinball/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   space-cadet-pinball:
-    image: nginx:1.25.5
+    image: nginx:1.26.2
     networks:
       - default
       - traefik

docker/traefik/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - ./acme:/acme
-    image: traefik:v3.0.2
+    image: traefik:v3.2.1
     networks:
       - traefik
     command:
@@ -24,10 +24,12 @@ services:
       - --api.dashboard=true
     labels:
       - traefik.enable=true
-      - traefik.http.routers.RX.rule=Host(`traefik.yuuk1.uk`)
+      - traefik.http.routers.RX.rule=Host(`yuuk1.uk`)
       - traefik.http.routers.RX.entryPoints=websecure
       - traefik.http.routers.RX.tls=true
       - traefik.http.routers.RX.tls.certResolver=letsencrypt
+      - traefik.http.routers.RX.tls.domains[0].main=yuuk1.uk
+      - traefik.http.routers.RX.tls.domains[0].sans=*.yuuk1.uk
       - traefik.http.routers.RX.service=api@internal
     environment:
       - CF_DNS_API_TOKEN=${CF_DNS_API_TOKEN}

docker/x-redirect/docker-compose.yml

@@ -0,0 +1,21 @@
+services:
+  x-redirect:
+    image: nginx:1.26.2
+    networks:
+      - default
+      - traefik
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.R7.rule=Host(`xtaiko.yuuk1.uk`) || Host(`xazi.yuuk1.uk`)
+      - traefik.http.routers.R7.entryPoints=websecure
+      - traefik.http.routers.R7.tls=true
+      - traefik.http.routers.R7.tls.certResolver=letsencrypt
+      - traefik.http.routers.R7.service=S7
+      - traefik.http.services.S7.loadbalancer.server.port=80
+    volumes:
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf
+
+networks:
+  traefik:
+    external: true
+    name: traefik

docker/x-redirect/nginx.conf

@@ -0,0 +1,13 @@
+server {
+    listen 80;
+    server_name xtaiko.yuuk1.uk;
+
+    return 301 https://xcancel.com/search?f=tweets&q=list%3A1857303587724165239+-filter%3Anativeretweets;
+}
+
+server {
+    listen 80;
+    server_name xazi.yuuk1.uk;
+
+    return 301 https://xcancel.com/search?f=tweets&q=list%3A1857298009937338497+-filter%3Anativeretweets;
+}

running-forever/start.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-services=( traefik taiko-web litey stats )
-
-args=("${@:-"${services[@]}"}")
-
-for service in "${args[@]}"; do
-  echo "$service を再起動しています…"
-  (
-    cd "../docker/$service"
-    tmux kill-session -t "$service"
-    tmux new-session -s "$service" -d
-    tmux send-keys -t "$service" "while true; do docker compose down; docker compose up --abort-on-container-exit; done" C-m
-  )
-done