summaryrefslogtreecommitdiffstats
path: root/mv
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-09-01 21:52:48 +0200
committerlassulus <lassulus@lassul.us>2017-09-01 21:52:48 +0200
commit6bb5eeeb0551deea4532976df5238b888788c94e (patch)
tree125201d24bcca4cebacbb046f76ddf2dba0d7492 /mv
parent1234efe72de6912f0a728eaac6c64979a729c973 (diff)
parent056b02ed05a38a8a032ad70b4ec092dd07ba6736 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'mv')
-rw-r--r--mv/dummy_secrets/default.nix8
-rw-r--r--mv/dummy_secrets/ssh.ed255193
-rw-r--r--mv/source.nix2
3 files changed, 12 insertions, 1 deletions
diff --git a/mv/dummy_secrets/default.nix b/mv/dummy_secrets/default.nix
new file mode 100644
index 000000000..84a5e1186
--- /dev/null
+++ b/mv/dummy_secrets/default.nix
@@ -0,0 +1,8 @@
+{ config, ... }:
+{
+ users.users.root = {
+ openssh.authorizedKeys.keys = [
+ config.krebs.users.mv.pubkey
+ ];
+ };
+}
diff --git a/mv/dummy_secrets/ssh.ed25519 b/mv/dummy_secrets/ssh.ed25519
new file mode 100644
index 000000000..a7d2adab4
--- /dev/null
+++ b/mv/dummy_secrets/ssh.ed25519
@@ -0,0 +1,3 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+dummy
+-----END OPENSSH PRIVATE KEY-----
diff --git a/mv/source.nix b/mv/source.nix
index 8b1563914..aa2b13fd8 100644
--- a/mv/source.nix
+++ b/mv/source.nix
@@ -10,7 +10,7 @@ in
nixos-config.symlink = "stockholm/mv/1systems/${name}/config.nix";
nixpkgs.git = {
# nixos-17.03
- ref = mkDefault "94941cb0455bfc50b1bf63186cfad7136d629f78";
+ ref = mkDefault "56da88a298a6f549701a10bb12072804a1ebfbd5";
url = https://github.com/NixOS/nixpkgs;
};
secrets.file = getAttr builder {