Use global configuration for tools users

Fixes https://git.immae.eu/mantisbt/view.php?id=95

diff --git a/nixops/modules/websites/tools/diaspora/default.nix b/nixops/modules/websites/tools/diaspora/default.nix
index ae870b082a2a4c892f185e4861e978951c89240a..8d62c7e3f798830faf963d250475c2802a7c87ba 100644 (file)
--- a/nixops/modules/websites/tools/diaspora/default.nix
+++ b/nixops/modules/websites/tools/diaspora/default.nix
@@ -12,8 +12,8 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    ids.uids.diaspora = 398;
-    ids.gids.diaspora = 398;
+    ids.uids.diaspora = myconfig.env.tools.diaspora.user.uid;
+    ids.gids.diaspora = myconfig.env.tools.diaspora.user.gid;
 
     users.users.diaspora = {
       name = "diaspora";

diff --git a/nixops/modules/websites/tools/mastodon/default.nix b/nixops/modules/websites/tools/mastodon/default.nix
index f1a207feb97554d305ca2d8e7fc2871705a3955d..3740a49c60c4644e5fdcad618152f25147d440c5 100644 (file)
--- a/nixops/modules/websites/tools/mastodon/default.nix
+++ b/nixops/modules/websites/tools/mastodon/default.nix
@@ -12,8 +12,8 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    ids.uids.mastodon = 399;
-    ids.gids.mastodon = 399;
+    ids.uids.mastodon = myconfig.env.tools.mastodon.user.uid;
+    ids.gids.mastodon = myconfig.env.tools.mastodon.user.gid;
 
     users.users.mastodon = {
       name = "mastodon";

diff --git a/nixops/modules/websites/tools/mediagoblin/default.nix b/nixops/modules/websites/tools/mediagoblin/default.nix
index 5f60503d32e204272283dc2d9c434139a402dd9e..90b115e1e3cddd11fb8d488010ac1c18f4954b8b 100644 (file)
--- a/nixops/modules/websites/tools/mediagoblin/default.nix
+++ b/nixops/modules/websites/tools/mediagoblin/default.nix
@@ -12,8 +12,8 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    ids.uids.mediagoblin = 397;
-    ids.gids.mediagoblin = 397;
+    ids.uids.mediagoblin = myconfig.env.tools.mediagoblin.user.uid;
+    ids.gids.mediagoblin = myconfig.env.tools.mediagoblin.user.gid;
 
     users.users.mediagoblin = {
       name = "mediagoblin";