From c7d91f68f972a671a27ea3857ea95665b6cf1e52 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Wed, 16 Oct 2019 08:29:34 +0200 Subject: [PATCH] Fix Mastodon Web systemd service Removes a legacy property from the config, which made the service fail to start after having upgraded systemd on Andromeda. --- nodes/andromeda.kosmos.org.json | 3 +-- .../templates/default/mastodon-web.systemd.service.erb | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nodes/andromeda.kosmos.org.json b/nodes/andromeda.kosmos.org.json index b01bd6a..7affd98 100644 --- a/nodes/andromeda.kosmos.org.json +++ b/nodes/andromeda.kosmos.org.json @@ -107,8 +107,7 @@ "tor-full::default", "kosmos-base::letsencrypt", "git::default", - "git::package", - "poise-git::default" + "git::package" ], "platform": "ubuntu", "platform_version": "18.04", diff --git a/site-cookbooks/kosmos-mastodon/templates/default/mastodon-web.systemd.service.erb b/site-cookbooks/kosmos-mastodon/templates/default/mastodon-web.systemd.service.erb index 315c216..94a6346 100644 --- a/site-cookbooks/kosmos-mastodon/templates/default/mastodon-web.systemd.service.erb +++ b/site-cookbooks/kosmos-mastodon/templates/default/mastodon-web.systemd.service.erb @@ -16,7 +16,6 @@ Environment="LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1" ExecStart=<%= @bundle_path %> exec puma -C config/puma.rb --pidfile <%= @app_dir %>/tmp/puma.pid ExecStop=<%= @bundle_path %> exec puma -C config/puma.rb --pidfile <%= @app_dir %>/tmp/puma.pid stop ExecReload=<%= @bundle_path %> exec pumactl -F config/puma.rb --pidfile <%= @app_dir %>/tmp/puma.pid phased-restart -ExecRestart=<%= @bundle_path %> exec pumactl -F config/puma.rb --pidfile <%= @app_dir %>/tmp/puma.pid restart TimeoutSec=15 Restart=always -- 2.25.1