From e170b6811db4b38218ed03aae31c64633eb4d0b9 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Thu, 4 Apr 2024 21:04:19 +0530 Subject: [PATCH] Tweaks Refs: https://github.com/knadh/listmonk/blob/master/listmonk-simple.service#L16 --- infra/services/listmonk/README.md | 2 +- infra/services/listmonk/initialize-db.sh | 3 +-- infra/services/listmonk/listmonk.nginx.conf | 4 +++- infra/services/listmonk/listmonk.service | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) mode change 100644 => 100755 infra/services/listmonk/initialize-db.sh diff --git a/infra/services/listmonk/README.md b/infra/services/listmonk/README.md index d357cc672..e94c676cd 100644 --- a/infra/services/listmonk/README.md +++ b/infra/services/listmonk/README.md @@ -35,7 +35,7 @@ sudo mv listmonk.nginx.conf /root/nginx/conf.d > ```sh > scp services/listmonk/initialize-db.sh : > -> sudo ./initialize-db.sh +> sudo sh initialize-db.sh > rm initialize-db.sh > ``` diff --git a/infra/services/listmonk/initialize-db.sh b/infra/services/listmonk/initialize-db.sh old mode 100644 new mode 100755 index 7c94a12cf..576c607a9 --- a/infra/services/listmonk/initialize-db.sh +++ b/infra/services/listmonk/initialize-db.sh @@ -9,7 +9,6 @@ set -o xtrace docker pull listmonk/listmonk -docker run --rm --name listmonk \ - -p 9000:9000 \ +docker run -it --rm --name listmonk \ -v /root/listmonk/config.toml:/listmonk/config.toml:ro \ listmonk/listmonk ./listmonk --install diff --git a/infra/services/listmonk/listmonk.nginx.conf b/infra/services/listmonk/listmonk.nginx.conf index fd59a2980..783c28a8a 100644 --- a/infra/services/listmonk/listmonk.nginx.conf +++ b/infra/services/listmonk/listmonk.nginx.conf @@ -18,7 +18,9 @@ server { proxy_set_header X-Forwarded-Proto $scheme; # Use HTTP/1.1 when talking to upstream + # Also, while not necessary (AFAIK), also allow websockets. proxy_http_version 1.1; - proxy_set_header Connection ""; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; } } diff --git a/infra/services/listmonk/listmonk.service b/infra/services/listmonk/listmonk.service index 95a352bdd..46b1a5f41 100644 --- a/infra/services/listmonk/listmonk.service +++ b/infra/services/listmonk/listmonk.service @@ -10,6 +10,9 @@ WantedBy=multi-user.target ExecStartPre=docker pull listmonk/listmonk ExecStartPre=-docker stop listmonk ExecStartPre=-docker rm listmonk +ExecStartPre=-docker run --rm --name listmonk \ + -v /root/listmonk/config.toml:/listmonk/config.toml:ro \ + listmonk/listmonk --upgrade --yes ExecStart=docker run --name listmonk \ -p 9000:9000 \ -v /root/listmonk/config.toml:/listmonk/config.toml:ro \