From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Thu, 25 Apr 2019 23:44:53 +0000 (+0200)
Subject: Upgrade nixops to latest 19.03 branch
X-Git-Tag: nur_publish~106
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=362d300efa5bca3bb06e525180a4f0158579fd75;hp=8c4f6e37479002818bcfe7381cd4e4b47fd2d1fb;p=perso%2FImmae%2FConfig%2FNix.git

Upgrade nixops to latest 19.03 branch
---

diff --git a/nix_path_env b/nix_path_env
index 8e4c84d..bd976b6 100644
--- a/nix_path_env
+++ b/nix_path_env
@@ -4,9 +4,9 @@ if [ -z "$NIXOPS_DEPLOYMENT" ]; then
   # This will automatically upgrade to latest version at each build
   nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz"
 else
-  nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171931.3a4ffdd38b5/nixexprs.tar.xz"
+  nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03.172361.cf3e277dd0b/nixexprs.tar.xz"
 fi
-nixpkgsPrevious="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171931.3a4ffdd38b5/nixexprs.tar.xz"
+nixpkgsPrevious="$nixpkgs"
 nixpkgsNext="$nixpkgs"
 export NIX_PATH="nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious"
 
diff --git a/nixops/modules/ssh/default.nix b/nixops/modules/ssh/default.nix
index ece4b9f..81b7751 100644
--- a/nixops/modules/ssh/default.nix
+++ b/nixops/modules/ssh/default.nix
@@ -11,12 +11,12 @@
     mySecrets.keys = [{
       dest = "ssh-ldap";
       user = "nobody";
-      group = "nobody";
+      group = "nogroup";
       permissions = "0400";
       text = myconfig.env.sshd.ldap.password;
     }];
     system.activationScripts.sshd = ''
-      install -Dm400 -o nobody -g nobody -T /var/secrets/ssh-ldap /etc/ssh/ldap_password
+      install -Dm400 -o nobody -g nogroup -T /var/secrets/ssh-ldap /etc/ssh/ldap_password
       '';
     # ssh is strict about parent directory having correct rights, don't
     # move it in the nix store.