Compare commits

..

No commits in common. "0397b9db157224c59968f46f4ab362ddebabf80d" and "3e52a45c5234f306879474429c9ad2f329529d05" have entirely different histories.

7 changed files with 20 additions and 41 deletions

View file

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

View file

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

View file

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

View file

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

View file

@ -1,21 +0,0 @@
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

View file

@ -1,13 +0,0 @@
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;
}

15
running-forever/start.sh Normal file
View file

@ -0,0 +1,15 @@
#!/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