From 3b075825f1f2fc3578024454a8970e3797248209 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 26 Jan 2019 15:25:25 +0100
Subject: [PATCH] Use global configuration for tools users

Fixes https://git.immae.eu/mantisbt/view.php?id=95
---
 nixops/modules/websites/tools/diaspora/default.nix    | 4 ++--
 nixops/modules/websites/tools/mastodon/default.nix    | 4 ++--
 nixops/modules/websites/tools/mediagoblin/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixops/modules/websites/tools/diaspora/default.nix b/nixops/modules/websites/tools/diaspora/default.nix
index ae870b0..8d62c7e 100644
--- 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 f1a207f..3740a49 100644
--- 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 5f60503..90b115e 100644
--- 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";
-- 
2.41.0