From 6962eb92fc9a94ff2393651b9f972a30347d3b45 Mon Sep 17 00:00:00 2001 From: Octopus Octopus Date: Mon, 1 Apr 2024 19:28:47 -0500 Subject: [PATCH] detach --- mastodon-postgresql.service | 3 +-- mastodon-web.service | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mastodon-postgresql.service b/mastodon-postgresql.service index 0e19a66..3fcb868 100644 --- a/mastodon-postgresql.service +++ b/mastodon-postgresql.service @@ -5,12 +5,11 @@ After=NetworkManager.service network.target network-online.target RequiresMountsFor=/var/lib/containers/storage /var/run/containers/storage # %E is "the XDG_CONFIG path" -# docker run --net internal_network --restart always --shm-size 256mb --health-cmd CMD,pg_isready,-U,postgres -v ./postgres14:/var/lib/postgresql/data -e POSTGRES_HOST_AUTH_METHOD=trust postgres:14-alpine [Service] Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStart=/usr/bin/podman run --name mastodon-postgresql --net internal_network --restart always --shm-size 256mb --health-cmd CMD,pg_isready,-U,postgres -v mastodon-postgresql:/var/lib/postgresql/data -e POSTGRES_HOST_AUTH_METHOD=trust postgres:14 +ExecStart=/usr/bin/podman run -d --name mastodon-postgresql --net internal_network --restart always --shm-size 256mb --health-cmd CMD,pg_isready,-U,postgres -v mastodon-postgresql:/var/lib/postgresql/data -e POSTGRES_HOST_AUTH_METHOD=trust postgres:14 ExecStop=/usr/bin/podman stop mastodon-postgres ExecStopPost=/usr/bin/podman rm mastodon-postgres Type=oneshot diff --git a/mastodon-web.service b/mastodon-web.service index 62f334b..6969c54 100644 --- a/mastodon-web.service +++ b/mastodon-web.service @@ -5,12 +5,12 @@ After=NetworkManager.service network.target network-online.target RequiresMountsFor=/var/lib/containers/storage /var/run/containers/storage # %E is "the XDG_CONFIG path" -#docker run --net external_network --net internal_network --restart always --env-file .env.production --health-cmd "CMD-SHELL,wget -q --spider --proxy=off localhost:3000/health || exit 1" -p 127.0.0.1:3000:3000 -v ./public/system:/mastodon/public/system ghcr.io/mastodon/mastodon:v4.2.7 bundle exec puma -C config/puma.rb + [Service] Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStart=/usr/bin/podman run --name mastodon-web -net external_network --net internal_network --restart always --env-file %h/live/.env.production --health-cmd "CMD-SHELL,wget -q --spider --proxy=off localhost:3000/health || exit 1" -p 127.0.0.1:3000:3000 -v %h/live/public/system localhost/jademoe bundle exec puma -C config/puma.rb +ExecStart=/usr/bin/podman run -d --name mastodon-web -net external_network --net internal_network --restart always --env-file %h/live/.env.production --health-cmd "CMD-SHELL,wget -q --spider --proxy=off localhost:3000/health || exit 1" -p 127.0.0.1:3000:3000 -v %h/live/public/system localhost/jademoe bundle exec puma -C config/puma.rb ExecStop=/usr/bin/podman stop mastodon-web ExecStopPost=/usr/bin/podman rm mastodon-web Type=oneshot