summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-29 10:51:42 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-29 10:51:42 +0200
commita142d68b4391fc78cf8c3d4f86300e10c3bf730e (patch)
tree8bce3854a1930bd5ebcd0c4a98d889d8a387b0fb
parent0e23a175de3687df8232fe118cbe87f04228ff28 (diff)
downloadnixpkgs-a142d68b4391fc78cf8c3d4f86300e10c3bf730e.tar
nixpkgs-a142d68b4391fc78cf8c3d4f86300e10c3bf730e.tar.gz
nixpkgs-a142d68b4391fc78cf8c3d4f86300e10c3bf730e.tar.bz2
nixpkgs-a142d68b4391fc78cf8c3d4f86300e10c3bf730e.tar.lz
nixpkgs-a142d68b4391fc78cf8c3d4f86300e10c3bf730e.tar.xz
nixpkgs-a142d68b4391fc78cf8c3d4f86300e10c3bf730e.tar.zst
nixpkgs-a142d68b4391fc78cf8c3d4f86300e10c3bf730e.zip
Fix some uid/gid attributes to match the actual user/group name
-rw-r--r--nixos/modules/misc/ids.nix12
-rw-r--r--nixos/modules/services/databases/4store-endpoint.nix2
-rw-r--r--nixos/modules/services/databases/4store.nix2
-rw-r--r--nixos/modules/services/games/ghost-one.nix4
-rw-r--r--nixos/modules/services/misc/folding-at-home.nix2
5 files changed, 11 insertions, 11 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index d653ac51143..3f6aaa15bb4 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -52,13 +52,13 @@
       osgi = 34;
       tor = 35;
       cups = 36;
-      foldingAtHome = 37;
+      foldingathome = 37;
       sabnzbd = 38;
       kdm = 39;
-      ghostOne = 40;
+      ghostone = 40;
       git = 41;
-      fourStore = 42;
-      fourStoreEndpoint = 43;
+      fourstore = 42;
+      fourstorehttp = 43;
       virtuoso = 44;
       rtkit = 45;
       dovecot2 = 46;
@@ -173,8 +173,8 @@
       osgi = 34;
       ghostOne = 40;
       git = 41;
-      fourStore = 42;
-      fourStoreEndpoint = 43;
+      fourstore = 42;
+      fourstorehttpd = 43;
       virtuoso = 44;
       dovecot2 = 46;
       prayer = 49;
diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix
index 68913f15f95..f2d64b6891d 100644
--- a/nixos/modules/services/databases/4store-endpoint.nix
+++ b/nixos/modules/services/databases/4store-endpoint.nix
@@ -54,7 +54,7 @@ with lib;
 
     users.extraUsers = singleton
       { name = endpointUser;
-        uid = config.ids.uids.fourStoreEndpoint;
+        uid = config.ids.uids.fourstorehttp;
         description = "4Store SPARQL endpoint user";
 #        home = stateDir;
       };
diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix
index 1725672a659..469fef69c95 100644
--- a/nixos/modules/services/databases/4store.nix
+++ b/nixos/modules/services/databases/4store.nix
@@ -45,7 +45,7 @@ with lib;
 
     users.extraUsers = singleton
       { name = fourStoreUser;
-        uid = config.ids.uids.fourStore;
+        uid = config.ids.uids.fourstore;
         description = "4Store database user";
         home = stateDir;
       };
diff --git a/nixos/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix
index 7a3ecebec39..07d7287ed88 100644
--- a/nixos/modules/services/games/ghost-one.nix
+++ b/nixos/modules/services/games/ghost-one.nix
@@ -57,14 +57,14 @@ in
 
     users.extraUsers = singleton
       { name = ghostUser;
-        uid = config.ids.uids.ghostOne;
+        uid = config.ids.uids.ghostone;
         description = "Ghost One game server user";
         home = stateDir;
       };
 
     users.extraGroups = singleton
       { name = ghostUser;
-        gid = config.ids.gids.ghostOne;
+        gid = config.ids.gids.ghostone;
       };
 
     services.ghostOne.config = ''
diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix
index 0093e3c0c33..392d2d1f002 100644
--- a/nixos/modules/services/misc/folding-at-home.nix
+++ b/nixos/modules/services/misc/folding-at-home.nix
@@ -44,7 +44,7 @@ in {
 
     users.extraUsers = singleton
       { name = fahUser;
-        uid = config.ids.uids.foldingAtHome;
+        uid = config.ids.uids.foldingathome;
         description = "Folding@Home user";
         home = stateDir;
       };