Skip to content

Commit b10bbf4

Browse files
AnarchoBooleanismAnarchoBooleanism
committed
change: Move cicd-authorized-keys from constants files to Instance files, to have separate CI/CD keys per Instance
Add note to default user-login-types Module
1 parent b96c3d2 commit b10bbf4

12 files changed

Lines changed: 40 additions & 9 deletions

File tree

‎constants/homelab-constants-values.toml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ authorized-keys = [ # Try to rotate these every now and then...
77
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICBb79Z1HFfgBM2XVyURzsXRG0b0fJRNplyN3v80CF8j hihacks@crummytop",
88
]
99
cicd-username = "cicd"
10-
cicd-authorized-keys = [
11-
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC03O18a2GH5euD1k5mKW67mC04m1GyvmgymxOqrCypH saphnet-ansible-playbook" # Ansible
12-
]
1310
timezone = "America/Los_Angeles"
1411

1512
[networking]

‎instances/control-server/instance-values.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
hostname = "control-server"
55
domain = "int-net.saphnet.xyz"
66

7+
cicd-authorized-keys = [
8+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC03O18a2GH5euD1k5mKW67mC04m1GyvmgymxOqrCypH saphnet-ansible-playbook", # To remove
9+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA+SX6/CO0OENm91qVFyFpz9JYU1OdOjpB0JF3guQu+U saphnet-ansible-playbook", # ansible: 2026-06-29
10+
]
11+
712
[networking]
813
ip-address = "192.168.8.211" # control-server.int-net.saphnet.xyz
914
ip-prefix-length = 23 # 192.168.8.0/23

‎instances/dev-server/instance-values.toml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
hostname = "dev-server"
55
domain = "int-net.saphnet.xyz"
66

7+
cicd-authorized-keys = [
8+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC03O18a2GH5euD1k5mKW67mC04m1GyvmgymxOqrCypH saphnet-ansible-playbook", # To remove
9+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGVhxnQDWuvpdh7MRBmHzoFOBHHOSnAVeF2b4TxvOl7d saphnet-ansible-playbook", # ansible: 2026-06-29
10+
]
11+
712
[networking]
813
ip-address = "192.168.8.164" # control-server.int-net.saphnet.xyz
914
ip-prefix-length = 23 # 192.168.8.0/23
@@ -12,5 +17,5 @@ interface = "ens18"
1217
[users."naguerr2"]
1318
authorized-keys = [
1419
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxN4vMa7ngvfCD7lTZZmR1JDZwMaCJrTZQZNLNbhnOCvqUDTXBU6FBhvB2SCqii4p2ZtrCe6Hg7El0o6BAqiTUAur3gyjq7HnqTdgO3fAu251ar4a2TPQmIxP7wV0yKPhTPuivESJyyFPjgaQgJCwyH5YAHW4t9WvuFYS3eXc+HFbAUftg2TcdKmEIY6ZKKin4CFj+FBQWQb3k22oDocUitcQUC+00YsrtrtSqJJqbuWlq2CaZYsdMFy+lUtcB6Bny/EX4UrzvqF7eJKB2nhFIbzcIhwTcI+BA42+MUubR+uUHRq4zOnKlNnNdR9ybesjEWJI0PPI+7GNyilk0kfbXg3leRFrual1ef97prc4ijg5fXsUyiSc6IRx9pWhVTa4goecFFVRT3QDl5hjMQLh6n6WJJ7bq+vTnfaS5aWSBpLJdC7OISdQXq5t5OACSla71MXmCLR0kc6AVu0YWPjLBpPT3a788j2esCqWKChk8eq5Sud2P3CdNBueyJsIk/q8= hihacks@crummytop",
15-
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCyhCHD7EWRK/46XvkGwXjEfZ6gFxNIMco6PygtebcxlzmB19/3VEEc14wT2drRjqYXSQd7rOS49SQ4kQBPsLUcURW3YjOErVHZpJYVJo1WaJ39xgQUSkvWeSINRNMYhnYQGsv5sgTtIp8LUaMKAQD2M0TIvMkWtg7WlJyJqa0byYubenD29e4Y4eSdBWBNRws0sgEyU3tEv0JnGFVicCGyHGCerISxGYP2820AirjLhgEZw5NU/4DDDanzoR3mVKwALuseI/2eKfisDAwearzEXWKcG8jRe/88DZOFVAjUI1eJJbetZfHCqHo98j0IhzIdWQMgwxxdyLJa6HXSprbuPyGF01w6Q4CA42Vm+JF5KjEHVN4aMHrd7qk65811momcZ+BMiY5pO50fAyiAY8YUrqGyyQbEI94C0a03FMEHXr8vb5/+X3PLX+9NOPXNWXw2domCdL8Drt7E5XqtlREEJJwYp7soCzedVag1ALWadJN/clYGfnzHXa475CGMwqs= hihacks@valk-pc"
20+
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCyhCHD7EWRK/46XvkGwXjEfZ6gFxNIMco6PygtebcxlzmB19/3VEEc14wT2drRjqYXSQd7rOS49SQ4kQBPsLUcURW3YjOErVHZpJYVJo1WaJ39xgQUSkvWeSINRNMYhnYQGsv5sgTtIp8LUaMKAQD2M0TIvMkWtg7WlJyJqa0byYubenD29e4Y4eSdBWBNRws0sgEyU3tEv0JnGFVicCGyHGCerISxGYP2820AirjLhgEZw5NU/4DDDanzoR3mVKwALuseI/2eKfisDAwearzEXWKcG8jRe/88DZOFVAjUI1eJJbetZfHCqHo98j0IhzIdWQMgwxxdyLJa6HXSprbuPyGF01w6Q4CA42Vm+JF5KjEHVN4aMHrd7qk65811momcZ+BMiY5pO50fAyiAY8YUrqGyyQbEI94C0a03FMEHXr8vb5/+X3PLX+9NOPXNWXw2domCdL8Drt7E5XqtlREEJJwYp7soCzedVag1ALWadJN/clYGfnzHXa475CGMwqs= hihacks@valk-pc",
1621
]

‎instances/docker-host-core/instance-values.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
hostname = "docker-host-core"
55
domain = "int-net.saphnet.xyz"
66

7+
cicd-authorized-keys = [
8+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC03O18a2GH5euD1k5mKW67mC04m1GyvmgymxOqrCypH saphnet-ansible-playbook", # To remove
9+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPxGC5NHaSFgc+f/VoCBRYrJLCmVwmb5dppqoFO30ib5 saphnet-ansible-playbook", # ansible: 2026-06-29
10+
]
11+
712
[networking]
813
ip-address = "192.168.8.202" # docker-host-core.int-net.saphnet.xyz
914
ip-prefix-length = 23 # 192.168.8.0/23

‎instances/docker-host-pve3/instance-values.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
hostname = "docker-host-pve3"
55
domain = "int-net.saphnet.xyz"
66

7+
cicd-authorized-keys = [
8+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC03O18a2GH5euD1k5mKW67mC04m1GyvmgymxOqrCypH saphnet-ansible-playbook", # To remove
9+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF341T9RmVxSoR5YP4oBFV4Qeoy7CUxkqquDPkJSyVn+ saphnet-ansible-playbook", # ansible: 2026-06-29
10+
]
11+
712
[networking]
813
ip-address = "192.168.8.232" # docker-host-pve3.int-net.saphnet.xyz
914
ip-prefix-length = 23 # 192.168.8.0/23

‎instances/docker-host-pve4/instance-values.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
hostname = "docker-host-pve4"
55
domain = "int-net.saphnet.xyz"
66

7+
cicd-authorized-keys = [
8+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC03O18a2GH5euD1k5mKW67mC04m1GyvmgymxOqrCypH saphnet-ansible-playbook", # To remove
9+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE2ZznG3Cq7eNZHAK7/rQH/rBwZd41E/zuv9lFydLuvW saphnet-ansible-playbook", # ansible: 2026-06-29
10+
]
11+
712
[networking]
813
ip-address = "192.168.8.243" # docker-host-pve4.int-net.saphnet.xyz
914
ip-prefix-length = 23 # 192.168.8.0/23

‎instances/vpn-server-1/instance-values.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
hostname = "vpn-server-1"
55
domain = "int-net.saphnet.xyz"
66

7+
cicd-authorized-keys = [
8+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC03O18a2GH5euD1k5mKW67mC04m1GyvmgymxOqrCypH saphnet-ansible-playbook", # To remove
9+
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICAa0SEqcoD/j+6y8EpY8eQBE7ZtfWGtDkNWoP9xz5Oj saphnet-ansible-playbook" # ansible: 2026-06-29
10+
]
11+
712
[networking]
813
ip-address = "192.168.8.63" # vpn-server-1.int-net.saphnet.xyz
914
ip-prefix-length = 23 # 192.168.8.0/23

‎machines/control-server/configuration.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ in
4141
defaultUsername = constantsValues.default-username;
4242
authorizedKeys = constantsValues.authorized-keys;
4343
cicdUsername = constantsValues.cicd-username;
44-
cicdAuthorizedKeys = constantsValues.cicd-authorized-keys;
44+
cicdAuthorizedKeys = instanceValues.cicd-authorized-keys;
4545
})
4646
(../.. + "/modules/impermanence-types/default.nix")
4747
(import (../.. + "/modules/sops-nix-types/default-impermanence.nix") {

‎machines/dev-server/configuration.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ in
3333
defaultUsername = constantsValues.default-username;
3434
authorizedKeys = constantsValues.authorized-keys;
3535
cicdUsername = constantsValues.cicd-username;
36-
cicdAuthorizedKeys = constantsValues.cicd-authorized-keys;
36+
cicdAuthorizedKeys = instanceValues.cicd-authorized-keys;
3737
})
3838
(import (../.. + "/modules/sops-nix-types/default.nix") {
3939
inherit inputs secretsFile;

‎machines/docker-host/configuration.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ in
3434
defaultUsername = constantsValues.default-username;
3535
authorizedKeys = constantsValues.authorized-keys;
3636
cicdUsername = constantsValues.cicd-username;
37-
cicdAuthorizedKeys = constantsValues.cicd-authorized-keys;
37+
cicdAuthorizedKeys = instanceValues.cicd-authorized-keys;
3838
})
3939
(../.. + "/modules/impermanence-types/default.nix")
4040
(import (../.. + "/modules/sops-nix-types/default-impermanence.nix") {

0 commit comments

Comments
 (0)