diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-26 01:44:53 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-26 01:44:53 +0200 |
commit | 362d300efa5bca3bb06e525180a4f0158579fd75 (patch) | |
tree | b8b2e99cefa600b89cabf08134c3132c9fd3a777 | |
parent | 8c4f6e37479002818bcfe7381cd4e4b47fd2d1fb (diff) | |
download | Nix-362d300efa5bca3bb06e525180a4f0158579fd75.tar.gz Nix-362d300efa5bca3bb06e525180a4f0158579fd75.tar.zst Nix-362d300efa5bca3bb06e525180a4f0158579fd75.zip |
Upgrade nixops to latest 19.03 branch
-rw-r--r-- | nix_path_env | 4 | ||||
-rw-r--r-- | nixops/modules/ssh/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
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 | |||
4 | # This will automatically upgrade to latest version at each build | 4 | # This will automatically upgrade to latest version at each build |
5 | nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz" | 5 | nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz" |
6 | else | 6 | else |
7 | nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171931.3a4ffdd38b5/nixexprs.tar.xz" | 7 | nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03.172361.cf3e277dd0b/nixexprs.tar.xz" |
8 | fi | 8 | fi |
9 | nixpkgsPrevious="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171931.3a4ffdd38b5/nixexprs.tar.xz" | 9 | nixpkgsPrevious="$nixpkgs" |
10 | nixpkgsNext="$nixpkgs" | 10 | nixpkgsNext="$nixpkgs" |
11 | export NIX_PATH="nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious" | 11 | export NIX_PATH="nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious" |
12 | 12 | ||
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 @@ | |||
11 | mySecrets.keys = [{ | 11 | mySecrets.keys = [{ |
12 | dest = "ssh-ldap"; | 12 | dest = "ssh-ldap"; |
13 | user = "nobody"; | 13 | user = "nobody"; |
14 | group = "nobody"; | 14 | group = "nogroup"; |
15 | permissions = "0400"; | 15 | permissions = "0400"; |
16 | text = myconfig.env.sshd.ldap.password; | 16 | text = myconfig.env.sshd.ldap.password; |
17 | }]; | 17 | }]; |
18 | system.activationScripts.sshd = '' | 18 | system.activationScripts.sshd = '' |
19 | install -Dm400 -o nobody -g nobody -T /var/secrets/ssh-ldap /etc/ssh/ldap_password | 19 | install -Dm400 -o nobody -g nogroup -T /var/secrets/ssh-ldap /etc/ssh/ldap_password |
20 | ''; | 20 | ''; |
21 | # ssh is strict about parent directory having correct rights, don't | 21 | # ssh is strict about parent directory having correct rights, don't |
22 | # move it in the nix store. | 22 | # move it in the nix store. |