Remove use of environment variables

[perso/Immae/Config/Nix.git] / virtual / modules / websites / tools / mediagoblin / default.nix

diff --git a/virtual/modules/websites/tools/mediagoblin/default.nix b/virtual/modules/websites/tools/mediagoblin/default.nix
index 4df7e53a51e64fe9a02a47ce27330fcf9c055b6a..5f60503d32e204272283dc2d9c434139a402dd9e 100644 (file)
--- a/virtual/modules/websites/tools/mediagoblin/default.nix
+++ b/virtual/modules/websites/tools/mediagoblin/default.nix
@@ -1,7 +1,8 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
   mediagoblin = pkgs.callPackage ./mediagoblin.nix {
-    inherit (mylibs) checkEnv fetchedGit fetchedGithub;
+    inherit (mylibs) fetchedGit fetchedGithub;
+    env = myconfig.env.tools.mediagoblin;
   };
 
   cfg = config.services.myWebsites.tools.mediagoblin;
@@ -11,8 +12,6 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    # FIXME: Can we use dynamic users from systemd?
-    # nixos/modules/misc/ids.nix
     ids.uids.mediagoblin = 397;
     ids.gids.mediagoblin = 397;
 
@@ -80,7 +79,7 @@ in {
         User = "mediagoblin";
         PrivateTmp = true;
         Restart = "always";
-        TimeoutSec = 15;
+        TimeoutSec = 60;
         Type = "simple";
         WorkingDirectory = mediagoblin.pythonRoot;
         PIDFile = "${mediagoblin.socketsDir}/mediagoblin-celeryd.pid";
@@ -89,8 +88,6 @@ in {
       unitConfig.RequiresMountsFor = mediagoblin.varDir;
     };
 
-    # FIXME: background jobs and upload
-    # FIXME: initial sync
     system.activationScripts.mediagoblin = {
       deps = [ "users" ];
       text = ''
@@ -105,7 +102,6 @@ in {
 
     services.myWebsites.tools.modules = [
       "proxy" "proxy_http" "proxy_balancer"
-      # FIXME: probably only one balancer method is needed:
       "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat"
     ];
     users.users.wwwrun.extraGroups = [ "mediagoblin" ];