Upgrade syden peertube to flake

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

diff --git a/modules/webapps/mediagoblin.nix b/modules/webapps/mediagoblin.nix
index 575345758e1e090934d595cf14a5e2578fe45da3..3fe5e38327c23974e40169bebbfa80f4ea22bc34 100644 (file)
--- a/modules/webapps/mediagoblin.nix
+++ b/modules/webapps/mediagoblin.nix
@@ -15,8 +15,8 @@ let
 
     [app:mediagoblin]
     use = egg:mediagoblin#app
-    config = ${cfg.configFile} ${cfg.workdir}/mediagoblin.ini
-    /mgoblin_static = ${cfg.workdir}/mediagoblin/static
+    config = ${cfg.configFile} ${cfg.package}/mediagoblin.ini
+    /mgoblin_static = ${cfg.package}/mediagoblin/static
 
     [loggers]
     keys = root
@@ -87,26 +87,13 @@ in
     package = lib.mkOption {
       type = lib.types.package;
       default = pkgs.webapps.mediagoblin;
+      example = lib.literalExample ''
+        pkgs.webapps.mediagoblin.withPlugins (p: [p.basicsearch])
+      '';
       description = ''
         Mediagoblin package to use.
         '';
     };
-    plugins = lib.mkOption {
-      type = lib.types.listOf lib.types.package;
-      default = [];
-      description = ''
-        Mediagoblin plugins to use.
-        '';
-    };
-    # Output variables
-    workdir = lib.mkOption {
-      type = lib.types.package;
-      default = cfg.package.withPlugins cfg.plugins;
-      description = ''
-      Adjusted Mediagoblin package with plugins
-      '';
-      readOnly = true;
-    };
     systemdStateDirectory = lib.mkOption {
       type = lib.types.str;
       # Use ReadWritePaths= instead if varDir is outside of /var/lib
@@ -151,19 +138,24 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    users.users = lib.optionalAttrs (cfg.user == name) (lib.singleton {
-      inherit name;
-      inherit uid;
-      group = cfg.group;
-      description = "Mediagoblin 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 = "Mediagoblin user";
+        home = cfg.dataDir;
+        useDefaultShell = true;
+      };
+    };
+    users.groups = lib.optionalAttrs (cfg.group == name) {
+      "${name}" = {
+        inherit gid;
+      };
+    };
 
+    systemd.slices.mediagoblin = {
+      description = "Mediagoblin slice";
+    };
     systemd.services.mediagoblin-web = {
       description = "Mediagoblin service";
       wantedBy = [ "multi-user.target" ];
@@ -183,16 +175,21 @@ in
           ${paste_local} stop
         '';
       preStart = ''
+        if [ -d ${cfg.dataDir}/plugin_static/ ]; then
+          rm ${cfg.dataDir}/plugin_static/coreplugin_basic_auth
+          ln -sf ${cfg.package}/mediagoblin/plugins/basic_auth/static ${cfg.dataDir}/plugin_static/coreplugin_basic_auth
+        fi
         ./bin/gmg -cf ${cfg.configFile} dbupdate
         '';
 
       serviceConfig = {
+        Slice = "mediagoblin.slice";
         User = cfg.user;
         PrivateTmp = true;
         Restart = "always";
         TimeoutSec = 15;
         Type = "simple";
-        WorkingDirectory = cfg.workdir;
+        WorkingDirectory = cfg.package;
         RuntimeDirectory = cfg.systemdRuntimeDirectory;
         StateDirectory= cfg.systemdStateDirectory;
         PIDFile = cfg.pids.paster;
@@ -216,12 +213,13 @@ in
         '';
 
       serviceConfig = {
+        Slice = "mediagoblin.slice";
         User = cfg.user;
         PrivateTmp = true;
         Restart = "always";
         TimeoutSec = 60;
         Type = "simple";
-        WorkingDirectory = cfg.workdir;
+        WorkingDirectory = cfg.package;
         RuntimeDirectory = cfg.systemdRuntimeDirectory;
         StateDirectory= cfg.systemdStateDirectory;
         PIDFile = cfg.pids.celery;
@@ -229,16 +227,5 @@ in
 
       unitConfig.RequiresMountsFor = cfg.dataDir;
     };
-
-    system.activationScripts.mediagoblin = {
-      deps = [ "users" ];
-      text = ''
-      if [ -d ${cfg.dataDir}/plugin_static/ ]; then
-        rm ${cfg.dataDir}/plugin_static/coreplugin_basic_auth
-        ln -sf ${cfg.workdir}/mediagoblin/plugins/basic_auth/static ${cfg.dataDir}/plugin_static/coreplugin_basic_auth
-      fi
-      '';
-    };
-
   };
 }