diff --git a/.sops.yaml b/.sops.yaml index 2b53e28..0ad38b6 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,7 +1,7 @@ keys: - &joerg age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz creation_rules: - - path_regex: targets/.*/terraform.tfstate.sops$ + - path_regex: targets/.*/terraform.tfstate$ key_groups: - age: - *joerg diff --git a/targets/admins/apply.sh b/targets/admins/apply.sh deleted file mode 100755 index 1b2fc9e..0000000 --- a/targets/admins/apply.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -rm -f .terraform.lock.hcl -TFSTATE=$(mktemp) -if [[ -f "terraform.tfstate.sops" ]]; then - sops -d terraform.tfstate.sops > "$TFSTATE" -fi -toplevel=$(git rev-parse --show-toplevel) -backupdir=$toplevel/.git/terraform/$(basename "$(dirname "$0")") -cleanup() { - sops -e "$TFSTATE" > terraform.tfstate.sops && rm -f "$TFSTATE" -} -trap "cleanup" EXIT -terraform init -backup="$backupdir" -state-out="$TFSTATE" -terraform apply -backup="$backupdir" -state-out="$TFSTATE" diff --git a/targets/admins/terraform.tfstate b/targets/admins/terraform.tfstate new file mode 100644 index 0000000..1822fd1 --- /dev/null +++ b/targets/admins/terraform.tfstate @@ -0,0 +1,20 @@ +{ + "data": "ENC[AES256_GCM,data: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,iv:Vri/cfI1/U73XZiqY+AsPEbOh1HTxCiusy736NvsnH0=,tag:1VYcrPmunR45EeK3l4pMQg==,type:str]", + "sops": { + "kms": null, + "gcp_kms": null, + "azure_kv": null, + "hc_vault": null, + "age": [ + { + "recipient": "age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsQ1VZejVPbnJnS1dHVW1y\nWWRKMHR3NjB1azVkRCttMytrcmgwaEZxWW5ZCm5MeGN0bFRYajlXSTVMM2haQytC\neUhXbEhwTkVjbGNxYVNHKzZ0NTFPQ0EKLS0tIDlFQzNMbXBUSUMyZ2dtSHJHWGNJ\nbUE4OEhpZDRnWEZqVGVNdEVHekQ5QzQKH7LQ/Ih6GHdqHSt0EtpYbrG+CYwyFIHF\nZ/bcRSvrBYlLs4bh5MxJbxYyUNRGGQjESDuT/bZL8HkicWYjQONu7w==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2023-07-04T15:50:45Z", + "mac": "ENC[AES256_GCM,data:ROEpiYvLNqMpMj4Q5Kuxp1jJ1YsdTd19VdQSI09Jhcx5qNr5cbBYcWTO/548/x6lMTCELMy1nXciYjiDTt1lwR3eisXt0B5nZUaZ9cSu/EtXHC2esrsox0R+WRpOcMDYZiA6XIaNMNd2NYL/ePM3uZTZhC3UF+aDEeKPTiTowkk=,iv:y+vQ+qsM0tV5bBQRuysvnNu0REaRrtAu7NkdkMwm8cI=,tag:OJ9t3cbTTg/tApvnnyzCLA==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.7.3" + } +} \ No newline at end of file diff --git a/targets/admins/terraform.tfstate.sops b/targets/admins/terraform.tfstate.sops deleted file mode 100644 index 70e0287..0000000 --- a/targets/admins/terraform.tfstate.sops +++ /dev/null @@ -1,20 +0,0 @@ -{ - "data": "ENC[AES256_GCM,data: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,iv:MB5og2s7N+cTxZMRdSPtpBwTNeTMoEYnzalIHylYsyI=,tag:/NTdmINyoFot/beul8C9GA==,type:str]", - "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, - "age": [ - { - "recipient": "age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtYmYvczZrNHEzeTVvaXRH\nbEJGb1lZL2xrMTBOdGlyc0l3RnpHWU1YZTI0CkNEYy9EVEFITFVGOE5Mc2dsZktV\nM2tacVc3RGlqeHlsL2RuMGZQYUtscmsKLS0tIHFGVWRBNGpyNkptV0FRcHpMV1Jk\nSCs4c1lFaFU3WkcrWkQzcktKRkJCdVkKneJko1lw5CkORymxfibErFRb8fJEQl2E\naPNlUCAknCrb+raWClkbXFY1MSCcxrkFV+tx69O8hLaTlGUPnmGAeQ==\n-----END AGE ENCRYPTED FILE-----\n" - } - ], - "lastmodified": "2023-07-04T15:15:37Z", - "mac": "ENC[AES256_GCM,data:VMnIZxSc8QKp8s69gCvteTKkrlXP7/AkWamtnbd6SFCbhubpKoY88gyXv9QHLKwqclkKHyz3U9GsnvnEb3OUb8RX21l8bVPwB98OiLcBgd54KlizVVmz8fUDjjQf41PzuSs5LI0QoVKypfphtLjRViptBDPmCDYWk4Q1jEjARgs=,iv:BUgslpHCBnSnBSWUC62U0b0hqIC6l8RPKOeExXHhMgM=,tag:px/qDIZuycqn5NnDJa73ZA==,type:str]", - "pgp": null, - "unencrypted_suffix": "_unencrypted", - "version": "3.7.3" - } -} \ No newline at end of file diff --git a/targets/admins/tf.sh b/targets/admins/tf.sh new file mode 100755 index 0000000..e0f5f53 --- /dev/null +++ b/targets/admins/tf.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +set -euo pipefail + +rm -f .terraform.lock.hcl +if grep -q .sops terraform.tfstate; then + sops -i -d terraform.tfstate || true +fi +cleanup() { + sops -i -e terraform.tfstate +} +trap "cleanup" EXIT +terraform init +terraform "$@" diff --git a/targets/web01/apply.sh b/targets/web01/apply.sh deleted file mode 120000 index 7f6c3ba..0000000 --- a/targets/web01/apply.sh +++ /dev/null @@ -1 +0,0 @@ -../admins/apply.sh \ No newline at end of file diff --git a/targets/web01/configuration.nix b/targets/web01/configuration.nix index d9de2fe..6765b72 100644 --- a/targets/web01/configuration.nix +++ b/targets/web01/configuration.nix @@ -2,7 +2,7 @@ nixosVars = builtins.fromJSON (builtins.readFile ./nixos-vars.json); in { imports = [ - self.nixosModules.nixos-wiki + self.nixosModules.web01 self.nixosModules.hcloud ]; users.users.root.openssh.authorizedKeys.keys = nixosVars.ssh_keys; diff --git a/targets/web01/nixos-vars.json b/targets/web01/nixos-vars.json new file mode 100644 index 0000000..b1d8007 --- /dev/null +++ b/targets/web01/nixos-vars.json @@ -0,0 +1 @@ +{"ipv6_address":"2a01:4f9:c010:ab77::1","ssh_keys":["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIb3uuMqE/xSJ7WL/XpJ6QOj4aSmh0Ga+GtmJl3CDvljGuIeGCKh7YAoqZAi051k5j6ZWowDrcWYHIOU+h0eZCesgCf+CvunlXeUz6XShVMjyZo87f2JPs2Hpb+u/ieLx4wGQvo/Zw89pOly/vqpaX9ZwyIR+U81IAVrHIhqmrTitp+2FwggtaY4FtD6WIyf1hPtrrDecX8iDhnHHuGhATr8etMLwdwQ2kIBx5BBgCoiuW7wXnLUBBVYeO3II957XP/yU82c+DjSVJtejODmRAM/3rk+B7pdF5ShRVVFyB6JJR+Qd1g8iSH+2QXLUy3NM2LN5u5p2oTjUOzoEPWZo7lykZzmIWd/5hjTW9YiHC+A8xsCxQqs87D9HK9hLA6udZ6CGkq4hG/6wFwNjSMnv30IcHZzx6IBihNGbrisrJhLxEiKWpMKYgeemhIirefXA6UxVfiwHg3gJ8BlEBsj0tl/HVARifR2y336YINEn8AsHGhwrPTBFOnBTmfA/VnP1NlWHzXCfVimP6YVvdoGCCnAwvFuJ+ZuxmZ3UzBb2TenZZOzwzV0sUzZk0D1CaSBFJUU3oZNOkDIM6z5lIZgzsyKwb38S8Vs3HYE+Dqpkfsl4yeU5ldc6DwrlVwuSIa4vVus4eWD3gDGFrx98yaqOx17pc4CC9KXk/2TjtJY5xmQ==","ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine"]} \ No newline at end of file diff --git a/targets/web01/terraform.tf b/targets/web01/terraform.tf index 5875c65..2d317a5 100644 --- a/targets/web01/terraform.tf +++ b/targets/web01/terraform.tf @@ -5,6 +5,7 @@ terraform { module "web01" { source = "../../terraform/web01" domain = "clan.lol" + netlify_dns_zone = "clan.lol" nixos_flake_attr = "web01" nixos_vars_file = "${path.module}/nixos-vars.json" tags = { diff --git a/targets/web01/terraform.tfstate b/targets/web01/terraform.tfstate new file mode 100644 index 0000000..bd3f488 --- /dev/null +++ b/targets/web01/terraform.tfstate @@ -0,0 +1,20 @@ +{ + "data": "ENC[AES256_GCM,data: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,iv:LwnCTpSJ7TqT3+agwXht2zzPpWTKkcNQHsV4A9bmz38=,tag:luMQMbZbS3O/+lUcZTr3Tw==,type:str]", + "sops": { + "kms": null, + "gcp_kms": null, + "azure_kv": null, + "hc_vault": null, + "age": [ + { + "recipient": "age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQN1ZvVkVXdFFOdTFLRVE2\nd0NsSmg0RzZSdFNOYk9KR3BISTk5OElaNWlnCldURnpiekpxbkR0ZVlqN2Eycitu\ndkFxckRXVVgzK1J3UTBzT0podFB6ZW8KLS0tIHd3ZnE0ZWdEcGJQa0RpYnNqL3FY\nWXMwRm00VDB0dzF2L2owNmw4L2ZGRGsKEetYzd3S20lmCzQ2O/gZvM/Sl+GP6bOK\ni35xYjSgL0wp+FyEdmU67yjFxCpG0cm0zdvb7WJ1/OZEUsroblcv4g==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2023-07-04T15:51:21Z", + "mac": "ENC[AES256_GCM,data:dQbJTpwL+TIpLcT0jHi6LzYOu8fZY1bgczJWiEuPBMSDgeCeBbDT9Up7ZD+5u2bhsCsLJnvS5NrqPguBfGkMG6tClaV1t2uuXB22yCSQ5tF3KYcs4XN0e5x/IjSqEm/tNTbX7poEix7829UyNTQO17RcovcB+XqtPu2TJIM/Kcs=,iv:dcNF2Cq+/H6vSN8PZ1+y0XRPmA1CSeaCjF7ECIBKoCA=,tag:JNPdjEs6B68HGPAWU1IxFQ==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.7.3" + } +} \ No newline at end of file diff --git a/targets/web01/tf.sh b/targets/web01/tf.sh new file mode 120000 index 0000000..14d1657 --- /dev/null +++ b/targets/web01/tf.sh @@ -0,0 +1 @@ +../admins/tf.sh \ No newline at end of file diff --git a/terraform/admins/main.tf b/terraform/admins/main.tf index 5245e8b..58fcccd 100644 --- a/terraform/admins/main.tf +++ b/terraform/admins/main.tf @@ -3,6 +3,6 @@ resource "hcloud_ssh_key" "hcloud" { name = each.key public_key = each.value labels = { - "wiki" = "true" + "web01" = "true" } } diff --git a/terraform/web01/dns.tf b/terraform/web01/dns.tf index c9d7112..f05a3bd 100644 --- a/terraform/web01/dns.tf +++ b/terraform/web01/dns.tf @@ -1,18 +1,18 @@ -resource "netlify_dns_zone" "nixos" { +resource "netlify_dns_zone" "server" { site_id = "" name = var.netlify_dns_zone } -resource "netlify_dns_record" "nixos_wiki_a" { - zone_id = netlify_dns_zone.nixos.id +resource "netlify_dns_record" "server_a" { + zone_id = netlify_dns_zone.server.id hostname = var.domain type = "A" - value = hcloud_server.nixos_wiki.ipv4_address + value = hcloud_server.server.ipv4_address } -resource "netlify_dns_record" "nixos_wiki_aaaa" { - zone_id = netlify_dns_zone.nixos.id +resource "netlify_dns_record" "server_aaaa" { + zone_id = netlify_dns_zone.server.id hostname = var.domain type = "AAAA" - value = hcloud_server.nixos_wiki.ipv6_address + value = hcloud_server.server.ipv6_address } diff --git a/terraform/web01/main.tf b/terraform/web01/main.tf index ee8b33c..d76986e 100644 --- a/terraform/web01/main.tf +++ b/terraform/web01/main.tf @@ -1,14 +1,14 @@ # Record the SSH public key into Hetzner Cloud -data "hcloud_ssh_keys" "nixos_wiki" { - with_selector = "wiki=true" +data "hcloud_ssh_keys" "server" { + with_selector = "web01=true" } -resource "hcloud_server" "nixos_wiki" { +resource "hcloud_server" "server" { image = "debian-10" keep_disk = true - name = "nixos-wiki" + name = "web01" server_type = var.server_type - ssh_keys = data.hcloud_ssh_keys.nixos_wiki.ssh_keys.*.name + ssh_keys = data.hcloud_ssh_keys.server.ssh_keys.*.name backups = false labels = var.tags @@ -26,14 +26,14 @@ module "deploy" { 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 + target_host = hcloud_server.server.ipv4_address + instance_id = hcloud_server.server.id debug_logging = true } locals { nixos_vars = { - ipv6_address = hcloud_server.nixos_wiki.ipv6_address - ssh_keys = data.hcloud_ssh_keys.nixos_wiki.ssh_keys.*.public_key + ipv6_address = hcloud_server.server.ipv6_address + ssh_keys = data.hcloud_ssh_keys.server.ssh_keys.*.public_key } } diff --git a/terraform/web01/variables.tf b/terraform/web01/variables.tf index 50fda33..1540855 100644 --- a/terraform/web01/variables.tf +++ b/terraform/web01/variables.tf @@ -1,6 +1,6 @@ variable "server_type" { type = string - default = "cx21" + default = "cx31" description = "Hetzner cloud server type" }