all repos — nixfiles @ c01c7cf351d454fe2c2786cf2f7a1003f9d1c767

System and user configuration, managed by nix and home-manager

extract root ssh key to remote-admin role

Alin
commit

c01c7cf351d454fe2c2786cf2f7a1003f9d1c767

parent

4159a99d8358c0526f5329f55f9722c40406bcb4

6 files changed, 9 insertions(+), 22 deletions(-)

changed files
M system/hosts/linde.nix → system/hosts/linde.nix
@@ -161,11 +161,6 @@ security.sudo.extraConfig = ''
     Defaults:root,%wheel env_keep+=EDITOR
   '';
 
-  users.users.root = {
-    openssh.authorizedKeys.keys = [
-      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHYUyDdw92TNXguAxcmcmZmn/7ECGdRp6ckjxU+5zCw3BCnsS5+xEvHBVnnFdJRoH2XpfMeJjE+fi67zFVhlbn4= root@secretive.marvin"
-    ];
-  };
   users.users.alin = {
     extraGroups = [
       "wheel"
M system/hosts/r5.nix → system/hosts/r5.nix
@@ -66,12 +66,6 @@ "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBENXbdPPOq0mA+9bPklpUkikvIXjCEKE5IRwNPNMr5/Ta1J/ND737fexCjEb7YPoAJtaf0gD/JThQQi/RxDTvy4= alin@secretive.marvin.local"
     ];
   };
 
-  users.users.root = {
-    openssh.authorizedKeys.keys = [
-      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHYUyDdw92TNXguAxcmcmZmn/7ECGdRp6ckjxU+5zCw3BCnsS5+xEvHBVnnFdJRoH2XpfMeJjE+fi67zFVhlbn4= root@secretive.marvin.local"
-    ];
-  };
-
   services.caddy = {
     globalConfig = ''
       pki {
M system/hosts/r6.nix → system/hosts/r6.nix
@@ -318,12 +318,6 @@ "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJVREjPey2TOIPzfYJoG9yIR4Rui7tNJK2QIKa+pbgsyXg31hhPIw37LRRIic+l53mW8eahHxX3Y1IeTjcMw8IU= alan@secretive.marvin.local"
     ];
   };
 
-  users.users.root = {
-    openssh.authorizedKeys.keys = [
-      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHYUyDdw92TNXguAxcmcmZmn/7ECGdRp6ckjxU+5zCw3BCnsS5+xEvHBVnnFdJRoH2XpfMeJjE+fi67zFVhlbn4= root@secretive.marvin.local"
-    ];
-  };
-
   services.caddy = {
     enable = true;
     globalConfig = ''
M system/hosts/smrk.nix → system/hosts/smrk.nix
@@ -37,11 +37,6 @@ max-jobs = 4;
     };
   };
 
-  users.users.root = {
-    openssh.authorizedKeys.keys = [
-      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHYUyDdw92TNXguAxcmcmZmn/7ECGdRp6ckjxU+5zCw3BCnsS5+xEvHBVnnFdJRoH2XpfMeJjE+fi67zFVhlbn4= root@secretive.marvin"
-    ];
-  };
   users.users.alin = {
     extraGroups = [
       "wheel"
A system/roles/remote-admin.nix
@@ -0,0 +1,8 @@
+{ ... }:
+{
+  users.users.root = {
+    openssh.authorizedKeys.keys = [
+      "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHYUyDdw92TNXguAxcmcmZmn/7ECGdRp6ckjxU+5zCw3BCnsS5+xEvHBVnnFdJRoH2XpfMeJjE+fi67zFVhlbn4= root@secretive.marvin"
+    ];
+  };
+}
M system/roles/server.nix → system/roles/server.nix
@@ -16,6 +16,7 @@ ../settings/services/syncthing.nix
     ../settings/services/caddy.nix
     ../settings/services/ssh.nix
 
+    ./remote-admin.nix
     ./base.nix
   ];