From 903a1182b5c27cf0c07d267f136a0f2e5be3d89b Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 8 Oct 2017 23:14:14 +0200 Subject: gum.r: disable privkey setting via krebs manually configure the secrets instead --- krebs/3modules/makefu/default.nix | 3 ++- makefu/1systems/gum/config.nix | 4 +++- makefu/6tests/data/secrets/ssh_host_rsa_key | 0 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 makefu/6tests/data/secrets/ssh_host_rsa_key diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 0e6e5e7e..401cba97 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -580,7 +580,8 @@ with import ; ''; }; }; - ssh.privkey.path = ; + # configured manually + # ssh.privkey.path = ; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcxWFEPzke/Sdd9qNX6rSJgXal8NmINYajpFCxXfYdj root@gum"; }; shoney = rec { diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index e1357ff0..e769b1e2 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -81,7 +81,9 @@ in { ]; makefu.dl-dir = "/var/download"; - + services.openssh.hostKeys = [ + { bits = 4096; path = ; type = "rsa"; } + { path = ; type = "ed25519"; } ]; ###### stable services.nginx.virtualHosts.cgit.serverAliases = [ "cgit.euer.krebsco.de" ]; krebs.build.host = config.krebs.hosts.gum; diff --git a/makefu/6tests/data/secrets/ssh_host_rsa_key b/makefu/6tests/data/secrets/ssh_host_rsa_key new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3