summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorsils <sils@sils.li>2023-01-20 22:28:23 +0100
committersils <sils@sils.li>2023-01-20 22:28:23 +0100
commit22aa391c3d423023d7a92d39d8d28178301feb9a (patch)
treefd7d023055d7f535e55c4796e5fabd68d1c666b8
parentMerge pull request 'server1_rust-motd' (#11) from server1_rust-motd into server1 (diff)
parentRevert "Fix: revert changes in configuration.nix" (diff)
downloadnixos-server-22aa391c3d423023d7a92d39d8d28178301feb9a.tar.gz
nixos-server-22aa391c3d423023d7a92d39d8d28178301feb9a.zip
Merge pull request 'Remove ssh from the config file and make it's keys persistent' (#9) from server1_ssh into server1
Reviewed-on: https://git.sils.li/vhack.eu/nixos-server/pulls/9
Reviewed-by: sils <sils@sils.li>
-rw-r--r--configuration.nix11
-rw-r--r--services/opensshd.nix19
2 files changed, 20 insertions, 10 deletions
diff --git a/configuration.nix b/configuration.nix
index b92d72a..72c4895 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,6 +6,7 @@
 
     ./services/minecraft.nix
     ./services/rust-motd.nix
+    ./services/opensshd.nix
   ];
 
   boot.cleanTmpDir = true;
@@ -13,16 +14,6 @@
   networking.hostName = "server1";
   networking.domain = "vhack.eu";
 
-  # openssh config
-  services.openssh = {
-    enable = true;
-    passwordAuthentication = false;
-    extraConfig = "PrintMotd yes\n"; # this could be done with pam
-  };
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGBFuTNNn71Rhfnop2cdz3r/RhWWlCePnSBOhTBbu2ME soispha"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG63gxw8JePmrC8Fni0pLV4TnPBhCPmSV9FYEdva+6s7 sils"
-  ];
 
   system.stateVersion = "22.11";
 }
diff --git a/services/opensshd.nix b/services/opensshd.nix
new file mode 100644
index 0000000..4bd38fd
--- /dev/null
+++ b/services/opensshd.nix
@@ -0,0 +1,19 @@
+{ config, pkg, ... }: {
+  services.openssh = {
+    enable = true;
+    passwordAuthentication = false;
+    extraConfig = ''
+      PrintMotd yes
+    ''; # this could be done with pam
+    hostKeys = [{
+      comment = "key comment";
+      path = "/srv/sshd/ssh_host_ed25519_key";
+      rounds = 1000;
+      type = "ed25519";
+    }];
+  };
+  users.users.root.openssh.authorizedKeys.keys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGBFuTNNn71Rhfnop2cdz3r/RhWWlCePnSBOhTBbu2ME soispha"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG63gxw8JePmrC8Fni0pLV4TnPBhCPmSV9FYEdva+6s7 sils"
+  ];
+}