From 850adcf4b17afb6f5429b030f3c814d502d2b53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 7 Sep 2020 08:39:35 +0200 Subject: Put services in slices in systemd --- modules/webapps/mastodon.nix | 7 +++++++ modules/webapps/mediagoblin.nix | 5 +++++ 2 files changed, 12 insertions(+) (limited to 'modules/webapps') diff --git a/modules/webapps/mastodon.nix b/modules/webapps/mastodon.nix index cd550c0..2f5a8e3 100644 --- a/modules/webapps/mastodon.nix +++ b/modules/webapps/mastodon.nix @@ -111,6 +111,10 @@ in }; }; + systemd.slices.mastodon = { + description = "Mastodon slice"; + }; + systemd.services.mastodon-streaming = { description = "Mastodon Streaming"; wantedBy = [ "multi-user.target" ]; @@ -137,6 +141,7 @@ in ''; serviceConfig = { + Slice = "mastodon.slice"; User = cfg.user; EnvironmentFile = cfg.configFile; PrivateTmp = true; @@ -177,6 +182,7 @@ in exec ./bin/tootctl cache clear ''; serviceConfig = { + Slice = "mastodon.slice"; User = cfg.user; EnvironmentFile = cfg.configFile; PrivateTmp = true; @@ -239,6 +245,7 @@ in ''; serviceConfig = { + Slice = "mastodon.slice"; User = cfg.user; EnvironmentFile = cfg.configFile; PrivateTmp = true; diff --git a/modules/webapps/mediagoblin.nix b/modules/webapps/mediagoblin.nix index 19bbc2e..3fe5e38 100644 --- a/modules/webapps/mediagoblin.nix +++ b/modules/webapps/mediagoblin.nix @@ -153,6 +153,9 @@ in }; }; + systemd.slices.mediagoblin = { + description = "Mediagoblin slice"; + }; systemd.services.mediagoblin-web = { description = "Mediagoblin service"; wantedBy = [ "multi-user.target" ]; @@ -180,6 +183,7 @@ in ''; serviceConfig = { + Slice = "mediagoblin.slice"; User = cfg.user; PrivateTmp = true; Restart = "always"; @@ -209,6 +213,7 @@ in ''; serviceConfig = { + Slice = "mediagoblin.slice"; User = cfg.user; PrivateTmp = true; Restart = "always"; -- cgit v1.2.3