Configuration adjustments for shaarli and mastodon

[perso/Immae/Config/Nix.git] / modules / webapps / mastodon.nix

diff --git a/modules/webapps/mastodon.nix b/modules/webapps/mastodon.nix
index eed9e3f60d46760286adddace29cb791e4850f77..df2dbb23dac2a2eec289a037de296790071f3c1d 100644 (file)
--- a/modules/webapps/mastodon.nix
+++ b/modules/webapps/mastodon.nix
@@ -27,7 +27,7 @@ in
       '';
     };
     socketsPrefix = lib.mkOption {
-      type = lib.types.string;
+      type = lib.types.str;
       default = "live";
       description = ''
         The prefix to use for Mastodon sockets.
@@ -96,18 +96,24 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    users.users = lib.optionalAttrs (cfg.user == name) (lib.singleton {
-      inherit name;
-      inherit uid;
-      group = cfg.group;
-      description = "Mastodon user";
-      home = cfg.dataDir;
-      useDefaultShell = true;
-    });
-    users.groups = lib.optionalAttrs (cfg.group == name) (lib.singleton {
-      inherit name;
-      inherit gid;
-    });
+    users.users = lib.optionalAttrs (cfg.user == name) {
+      "${name}" = {
+        inherit uid;
+        group = cfg.group;
+        description = "Mastodon user";
+        home = cfg.dataDir;
+        useDefaultShell = true;
+      };
+    };
+    users.groups = lib.optionalAttrs (cfg.group == name) {
+      "${name}" = {
+        inherit gid;
+      };
+    };
+
+    systemd.slices.mastodon = {
+      description = "Mastodon slice";
+    };
 
     systemd.services.mastodon-streaming = {
       description = "Mastodon Streaming";
@@ -135,6 +141,7 @@ in
       '';
 
       serviceConfig = {
+        Slice = "mastodon.slice";
         User = cfg.user;
         EnvironmentFile = cfg.configFile;
         PrivateTmp = true;
@@ -160,7 +167,7 @@ in
       environment.BUNDLE_GEMFILE = "${cfg.workdir.gems.confFiles}/Gemfile";
       environment.SOCKET = cfg.sockets.rails;
 
-      path = [ cfg.workdir.gems cfg.workdir.gems.ruby pkgs.file ];
+      path = [ cfg.workdir.gems cfg.workdir.gems.ruby pkgs.file pkgs.imagemagick ];
 
       preStart = ''
         install -m 0755 -d ${cfg.dataDir}/tmp/cache
@@ -175,6 +182,7 @@ in
         exec ./bin/tootctl cache clear
         '';
       serviceConfig = {
+        Slice = "mastodon.slice";
         User = cfg.user;
         EnvironmentFile = cfg.configFile;
         PrivateTmp = true;
@@ -237,6 +245,7 @@ in
       '';
 
       serviceConfig = {
+        Slice = "mastodon.slice";
         User = cfg.user;
         EnvironmentFile = cfg.configFile;
         PrivateTmp = true;