holm/nixos-wiki-infra
1
0
Fork 0
forked from extern/nixos-wiki-infra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move ssh keys to its own target

Browse Source
This commit is contained in:
Jörg Thalheim 2023-05-14 18:18:38 +02:00
parent c08d3f873f
commit c10124a786
9 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
terraform/modules/admins/main.tf Normal file
View File

@ -0,0 +1,8 @@
resource "hcloud_ssh_key" "hcloud" {
for_each = var.ssh_keys
name = each.key
public_key = each.value
labels = {
"wiki" = "true"
}
}

5
terraform/modules/admins/providers.tf Normal file
View File

@ -0,0 +1,5 @@
terraform {
required_providers {
hcloud = { source = "hetznercloud/hcloud" }
}
}

5
terraform/modules/admins/variables.tf Normal file
View File

@ -0,0 +1,5 @@
variable "ssh_keys" {
type = map(string)
description = "SSH public keys for admin user (name -> key)"
}

26
terraform/modules/wiki/main.tf
View File

@ -1,8 +1,6 @@
# Record the SSH public key into Hetzner Cloud
resource "hcloud_ssh_key" "hcloud" {
for_each = var.admin_ssh_keys
name = "${var.domain}-${each.key}"
public_key = each.value
data "hcloud_ssh_keys" "nixos_wiki" {
with_selector = "wiki=true"
}
resource "hcloud_server" "nixos_wiki" {
@ -10,7 +8,7 @@ resource "hcloud_server" "nixos_wiki" {
keep_disk = true
name = "nixos-wiki"
server_type = var.server_type
ssh_keys = [for k in hcloud_ssh_key.hcloud : k.id]
ssh_keys = data.hcloud_ssh_keys.nixos_wiki.ssh_keys.*.name
backups = false
labels = var.tags
@ -23,15 +21,15 @@ resource "hcloud_server" "nixos_wiki" {
}
}
module "deploy" {
depends_on = [local_file.nixos_vars]
source = "github.com/numtide/nixos-anywhere//terraform/all-in-one"
nixos_system_attr = ".#nixosConfigurations.${var.nixos_flake_attr}.config.system.build.toplevel"
nixos_partitioner_attr = ".#nixosConfigurations.${var.nixos_flake_attr}.config.system.build.diskoNoDeps"
target_host = hcloud_server.nixos_wiki.ipv4_address
instance_id = hcloud_server.nixos_wiki.id
debug_logging = true
}
#module "deploy" {
# depends_on = [local_file.nixos_vars]
# source = "github.com/numtide/nixos-anywhere//terraform/all-in-one"
# nixos_system_attr = ".#nixosConfigurations.${var.nixos_flake_attr}.config.system.build.toplevel"
# nixos_partitioner_attr = ".#nixosConfigurations.${var.nixos_flake_attr}.config.system.build.diskoNoDeps"
# target_host = hcloud_server.nixos_wiki.ipv4_address
# instance_id = hcloud_server.nixos_wiki.id
# debug_logging = true
#}
locals {
nixos_vars = {

5
terraform/modules/wiki/variables.tf
View File

@ -1,8 +1,3 @@
variable "admin_ssh_keys" {
type = map(string)
description = "SSH public keys for admin user (name -> key)"
}
variable "server_type" {
type = string
default = "cx21"

1
terraform/targets/admins/apply.sh Symbolic link
View File

@ -0,0 +1 @@
../staging.nixos-wiki.thalheim.io/apply.sh

17
terraform/targets/admins/terraform.tf Normal file
View File

@ -0,0 +1,17 @@
terraform {
backend "http" {
address = "https://gitlab.com/api/v4/projects/45776186/terraform/state/admins"
lock_address = "https://gitlab.com/api/v4/projects/45776186/terraform/state/admins/lock"
unlock_address = "https://gitlab.com/api/v4/projects/45776186/terraform/state/admins/lock"
lock_method = "POST"
unlock_method = "DELETE"
retry_wait_min = "5"
}
}
module "wiki" {
source = "../../modules/admins"
ssh_keys = {
mic92 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine"
}
}

3
terraform/targets/nixos-wiki.thalheim.io/terraform.tf
View File

@ -11,9 +11,6 @@ terraform {
module "wiki" {
source = "../../modules/wiki"
admin_ssh_keys = {
mic92 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine"
}
netlify_dns_zone = "wiki.thalheim.io"
domain = "wiki.thalheim.io"
nixos_flake_attr = "nixos-wiki-production"

3
terraform/targets/staging.nixos-wiki.thalheim.io/terraform.tf
View File

@ -11,9 +11,6 @@ terraform {
module "wiki" {
source = "../../modules/wiki"
admin_ssh_keys = {
mic92 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine"
}
netlify_dns_zone = "wiki.thalheim.io"
nixos_flake_attr = "nixos-wiki-staging"
nixos_vars_file = "${path.module}/nixos-vars.json"