diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-09-07 08:39:35 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-09-07 08:39:35 +0200 |
commit | 850adcf4b17afb6f5429b030f3c814d502d2b53e (patch) | |
tree | 9e30459cec309e4b04bed476f9444a9335dac0af /modules/webapps | |
parent | de6d17ec97a1946f628372e5b0854cb21a91a55f (diff) | |
download | Nix-850adcf4b17afb6f5429b030f3c814d502d2b53e.tar.gz Nix-850adcf4b17afb6f5429b030f3c814d502d2b53e.tar.zst Nix-850adcf4b17afb6f5429b030f3c814d502d2b53e.zip |
Put services in slices in systemd
Diffstat (limited to 'modules/webapps')
-rw-r--r-- | modules/webapps/mastodon.nix | 7 | ||||
-rw-r--r-- | modules/webapps/mediagoblin.nix | 5 |
2 files changed, 12 insertions, 0 deletions
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 | |||
111 | }; | 111 | }; |
112 | }; | 112 | }; |
113 | 113 | ||
114 | systemd.slices.mastodon = { | ||
115 | description = "Mastodon slice"; | ||
116 | }; | ||
117 | |||
114 | systemd.services.mastodon-streaming = { | 118 | systemd.services.mastodon-streaming = { |
115 | description = "Mastodon Streaming"; | 119 | description = "Mastodon Streaming"; |
116 | wantedBy = [ "multi-user.target" ]; | 120 | wantedBy = [ "multi-user.target" ]; |
@@ -137,6 +141,7 @@ in | |||
137 | ''; | 141 | ''; |
138 | 142 | ||
139 | serviceConfig = { | 143 | serviceConfig = { |
144 | Slice = "mastodon.slice"; | ||
140 | User = cfg.user; | 145 | User = cfg.user; |
141 | EnvironmentFile = cfg.configFile; | 146 | EnvironmentFile = cfg.configFile; |
142 | PrivateTmp = true; | 147 | PrivateTmp = true; |
@@ -177,6 +182,7 @@ in | |||
177 | exec ./bin/tootctl cache clear | 182 | exec ./bin/tootctl cache clear |
178 | ''; | 183 | ''; |
179 | serviceConfig = { | 184 | serviceConfig = { |
185 | Slice = "mastodon.slice"; | ||
180 | User = cfg.user; | 186 | User = cfg.user; |
181 | EnvironmentFile = cfg.configFile; | 187 | EnvironmentFile = cfg.configFile; |
182 | PrivateTmp = true; | 188 | PrivateTmp = true; |
@@ -239,6 +245,7 @@ in | |||
239 | ''; | 245 | ''; |
240 | 246 | ||
241 | serviceConfig = { | 247 | serviceConfig = { |
248 | Slice = "mastodon.slice"; | ||
242 | User = cfg.user; | 249 | User = cfg.user; |
243 | EnvironmentFile = cfg.configFile; | 250 | EnvironmentFile = cfg.configFile; |
244 | PrivateTmp = true; | 251 | 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 | |||
153 | }; | 153 | }; |
154 | }; | 154 | }; |
155 | 155 | ||
156 | systemd.slices.mediagoblin = { | ||
157 | description = "Mediagoblin slice"; | ||
158 | }; | ||
156 | systemd.services.mediagoblin-web = { | 159 | systemd.services.mediagoblin-web = { |
157 | description = "Mediagoblin service"; | 160 | description = "Mediagoblin service"; |
158 | wantedBy = [ "multi-user.target" ]; | 161 | wantedBy = [ "multi-user.target" ]; |
@@ -180,6 +183,7 @@ in | |||
180 | ''; | 183 | ''; |
181 | 184 | ||
182 | serviceConfig = { | 185 | serviceConfig = { |
186 | Slice = "mediagoblin.slice"; | ||
183 | User = cfg.user; | 187 | User = cfg.user; |
184 | PrivateTmp = true; | 188 | PrivateTmp = true; |
185 | Restart = "always"; | 189 | Restart = "always"; |
@@ -209,6 +213,7 @@ in | |||
209 | ''; | 213 | ''; |
210 | 214 | ||
211 | serviceConfig = { | 215 | serviceConfig = { |
216 | Slice = "mediagoblin.slice"; | ||
212 | User = cfg.user; | 217 | User = cfg.user; |
213 | PrivateTmp = true; | 218 | PrivateTmp = true; |
214 | Restart = "always"; | 219 | Restart = "always"; |