From fc222b5e60dc5fce6ec39bb664e2b25a7a9ab950 Mon Sep 17 00:00:00 2001 From: Kohei Watanabe Date: Sun, 3 Jul 2022 19:40:51 +0900 Subject: [PATCH] =?UTF-8?q?minicharge.keiu.net=20=E2=86=92=20minicharge.fl?= =?UTF-8?q?y.dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 1 - .gitignore | 1 - README.md | 3 --- compose.yml | 11 ----------- etc/caddy/Caddyfile | 2 +- 5 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 .env.example delete mode 100644 .gitignore diff --git a/.env.example b/.env.example deleted file mode 100644 index 1d11df2..0000000 --- a/.env.example +++ /dev/null @@ -1 +0,0 @@ -#DATABASE_URL= diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f10862a..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/.env diff --git a/README.md b/README.md index eb1d06a..5456a34 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ - Docker Compose - systemd - systemd-journald -- PostgreSQL Git リポジトリを取得し、設定ファイルを配置 @@ -15,8 +14,6 @@ git clone git@github.com:kou029w/keiu.net.git cd keiu.net sudo install -m 644 {,/}etc/docker/daemon.json sudo systemctl restart docker -cp .env{.example,} -editor .env # PostgreSQL接続URLを設定 ``` ## 構築 diff --git a/compose.yml b/compose.yml index c0c4d5a..1209762 100644 --- a/compose.yml +++ b/compose.yml @@ -11,16 +11,6 @@ services: - ./srv:/srv - caddy_data:/data - caddy_config:/config - - minicharge_tmp:/tmp/minicharge - minicharge: - image: miniflux/miniflux:2.0.37@sha256:0a768ab76a1e8e0f03b1a29d9a8424eb60af71af937da35677e87d5a4ef65bf6 - restart: unless-stopped - environment: - LISTEN_ADDR: /tmp/miniflux.sock - DATABASE_URL: ${DATABASE_URL} - RUN_MIGRATIONS: "1" - volumes: - - minicharge_tmp:/tmp dns.keiu.net: image: coredns/coredns:1.9.3@sha256:8e352a029d304ca7431c6507b56800636c321cb52289686a581ab70aaa8a2e2a restart: unless-stopped @@ -37,4 +27,3 @@ services: volumes: caddy_data: caddy_config: - minicharge_tmp: diff --git a/etc/caddy/Caddyfile b/etc/caddy/Caddyfile index 81cc570..7a33d4c 100644 --- a/etc/caddy/Caddyfile +++ b/etc/caddy/Caddyfile @@ -10,7 +10,7 @@ www.keiu.net { redir https://keiu.net{uri} 308 } minicharge.keiu.net { - reverse_proxy unix//tmp/minicharge/miniflux.sock + redir https://minicharge.fly.dev permanent } dns.keiu.net { reverse_proxy https://dns.keiu.net