diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml index 41abab4..fd165f7 100644 --- a/mastodon/docker-compose.yml +++ b/mastodon/docker-compose.yml @@ -136,7 +136,7 @@ services: # - triton.cns.services=mastodon-redis web: - image: tootsuite/mastodon:v4.2.0 + image: tootsuite/mastodon:v4.2.1 mem_limit: 1g restart: always env_file: .env.production @@ -149,7 +149,7 @@ services: - triton.cns.services=mastodon-web streaming: - image: tootsuite/mastodon:v4.2.0 + image: tootsuite/mastodon:v4.2.1 mem_limit: 1g restart: always env_file: .env.production @@ -162,7 +162,7 @@ services: - triton.cns.services=mastodon-streaming sidekiq: - image: tootsuite/mastodon:v4.2.0 + image: tootsuite/mastodon:v4.2.1 mem_limit: 1g restart: always env_file: .env.production diff --git a/terraform/lev-1/dns.tf b/terraform/lev-1/dns.tf index a6244f2..bca3b15 100644 --- a/terraform/lev-1/dns.tf +++ b/terraform/lev-1/dns.tf @@ -6,28 +6,28 @@ resource "namecheap_domain_records" "pub-solar" { record { hostname = "flora-6" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "auth" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "ci" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "git" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "stream" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "list" @@ -36,13 +36,13 @@ resource "namecheap_domain_records" "pub-solar" { } record { hostname = "obs-portal" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "vpn" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "cache" @@ -56,64 +56,64 @@ resource "namecheap_domain_records" "pub-solar" { } record { hostname = "collabora" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "@" - type = "ALIAS" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" ttl = 300 } record { hostname = "chat" - type = "CNAME" - address = "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone." + type = "A" + address = "85.88.23.162" } record { hostname = "cloud" - type = "CNAME" - address = "nc-web.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.133" } record { hostname = "coturn" - type = "CNAME" - address = "nc-hpb.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.239" } record { hostname = "hpb" - type = "CNAME" - address = "nc-hpb.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.239" } record { hostname = "dimension" - type = "CNAME" - address = "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone." + type = "A" + address = "85.88.23.162" } record { hostname = "element" - type = "CNAME" - address = "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone." + type = "A" + address = "85.88.23.162" } record { hostname = "files" - type = "CNAME" - address = "mastodon-proxy.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone." + type = "A" + address = "85.88.23.161" } record { hostname = "mastodon" - type = "CNAME" - address = "mastodon-proxy.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone." + type = "A" + address = "85.88.23.161" } record { hostname = "matrix" - type = "CNAME" - address = "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone." + type = "A" + address = "85.88.23.162" } record { hostname = "www" - type = "CNAME" - address = "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone." + type = "A" + address = "80.71.153.210" } record { hostname = "@" @@ -147,6 +147,16 @@ resource "namecheap_domain_records" "pub-solar" { address = "list.pub.solar" mx_pref = "0" } + record { + hostname = "nachtigall" + type = "A" + address = "138.201.80.102" + } + record { + hostname = "nachtigall" + type = "AAAA" + address = "2a01:4f8:172:1c25::1" + } # SRV records can only be changed via NameCheap Web UI # add comment } diff --git a/terraform/lev-1/terraform.tfstate b/terraform/lev-1/terraform.tfstate deleted file mode 100644 index 27cbd91..0000000 --- a/terraform/lev-1/terraform.tfstate +++ /dev/null @@ -1,380 +0,0 @@ -{ - "version": 4, - "terraform_version": "1.2.3", - "serial": 15, - "lineage": "cfe1d94a-dfcd-c7f1-dd8e-6c5305326e2f", - "outputs": {}, - "resources": [ - { - "mode": "data", - "type": "triton_image", - "name": "nixos", - "provider": "provider[\"registry.terraform.io/joyent/triton\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "4c0be8bc-cbc9-660f-9736-c6a0fa0a894c", - "most_recent": true, - "name": "nixos-22", - "os": null, - "owner": null, - "public": null, - "state": null, - "type": null, - "version": null - }, - "sensitive_attributes": [] - } - ] - }, - { - "mode": "data", - "type": "triton_network", - "name": "private", - "provider": "provider[\"registry.terraform.io/joyent/triton\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "fabric": true, - "id": "3a8563cb-2930-49b2-954d-d81e0f68ce23", - "name": "My-Fabric-Network", - "public": false - }, - "sensitive_attributes": [] - } - ] - }, - { - "mode": "data", - "type": "triton_network", - "name": "public", - "provider": "provider[\"registry.terraform.io/joyent/triton\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "fabric": false, - "id": "b787ced8-84fd-4303-a320-53647979aa93", - "name": "public_ip_pool", - "public": true - }, - "sensitive_attributes": [] - } - ] - }, - { - "mode": "managed", - "type": "namecheap_domain_records", - "name": "pub-solar", - "provider": "provider[\"registry.terraform.io/namecheap/namecheap\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "domain": "pub.solar", - "email_type": "MX", - "id": "pub.solar", - "mode": "OVERWRITE", - "nameservers": null, - "record": [ - { - "address": "80.244.242.2", - "hostname": "factorio", - "mx_pref": 10, - "ttl": 1799, - "type": "A" - }, - { - "address": "80.71.153.210", - "hostname": "list", - "mx_pref": 10, - "ttl": 1799, - "type": "A" - }, - { - "address": "95.217.225.160", - "hostname": "cache", - "mx_pref": 10, - "ttl": 1799, - "type": "A" - }, - { - "address": "95.217.225.160", - "hostname": "collabora", - "mx_pref": 10, - "ttl": 1799, - "type": "A" - }, - { - "address": "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "@", - "mx_pref": 10, - "ttl": 300, - "type": "ALIAS" - }, - { - "address": "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "auth", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "ci", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "flora-6", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "git", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "obs-portal", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "stream", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "vpn", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "www", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "list.pub.solar", - "hostname": "list", - "mx_pref": 0, - "ttl": 1799, - "type": "MX" - }, - { - "address": "mastodon-proxy.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "files", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "mastodon-proxy.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "mastodon", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "chat", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "dimension", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "element", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "matrix", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "mx2.greenbaum.cloud.", - "hostname": "@", - "mx_pref": 0, - "ttl": 1799, - "type": "MX" - }, - { - "address": "nc-hpb.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "coturn", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "nc-hpb.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "hpb", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "nc-web.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "cloud", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "v=DMARC1; p=reject;", - "hostname": "_dmarc", - "mx_pref": 10, - "ttl": 1799, - "type": "TXT" - }, - { - "address": "v=DMARC1; p=reject;", - "hostname": "_dmarc.list", - "mx_pref": 10, - "ttl": 1799, - "type": "TXT" - }, - { - "address": "v=spf1 a:list.pub.solar ?all", - "hostname": "list", - "mx_pref": 10, - "ttl": 1799, - "type": "TXT" - }, - { - "address": "v=spf1 include:spf.greenbaum.cloud a:list.pub.solar ~all", - "hostname": "@", - "mx_pref": 10, - "ttl": 1799, - "type": "TXT" - } - ] - }, - "sensitive_attributes": [], - "private": "bnVsbA==" - } - ] - }, - { - "mode": "managed", - "type": "triton_machine", - "name": "pub-solar-infra-vm-1", - "provider": "provider[\"registry.terraform.io/joyent/triton\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "administrator_pw": "", - "affinity": null, - "cloud_config": "", - "cns": [ - { - "disable": false, - "services": [ - "flora-6" - ] - } - ], - "compute_node": "1cc79e74-9554-e611-9234-0894ef22d041", - "created": null, - "dataset": "4c0be8bc-cbc9-660f-9736-c6a0fa0a894c", - "delegate_dataset": false, - "deletion_protection_enabled": false, - "disk": 245760, - "domain_names": [ - "d347ec63-9d45-43a6-a6ad-1b62740b65a3.inst.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone", - "flora-6.inst.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone", - "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone", - "d347ec63-9d45-43a6-a6ad-1b62740b65a3.inst.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone", - "my-fabric-network.d347ec63-9d45-43a6-a6ad-1b62740b65a3.inst.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone", - "flora-6.inst.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone", - "my-fabric-network.flora-6.inst.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone", - "flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone", - "my-fabric-network.flora-6.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone" - ], - "firewall_enabled": false, - "id": "d347ec63-9d45-43a6-a6ad-1b62740b65a3", - "image": "4c0be8bc-cbc9-660f-9736-c6a0fa0a894c", - "ips": [ - "80.71.153.210", - "192.168.128.57" - ], - "locality": [], - "memory": 16384, - "metadata": {}, - "name": "flora-6", - "networks": [ - "b787ced8-84fd-4303-a320-53647979aa93", - "3a8563cb-2930-49b2-954d-d81e0f68ce23" - ], - "nic": [ - { - "gateway": "192.168.128.1", - "ip": "192.168.128.57", - "mac": "90:b8:d0:88:8f:82", - "netmask": "255.255.252.0", - "network": "3a8563cb-2930-49b2-954d-d81e0f68ce23", - "primary": false, - "state": "running" - }, - { - "gateway": "80.71.153.1", - "ip": "80.71.153.210", - "mac": "90:b8:d0:26:a4:bc", - "netmask": "255.255.255.0", - "network": "cf3c73c2-7e07-4334-a1aa-c06f9e41ba48", - "primary": true, - "state": "running" - } - ], - "package": "bhyve-huge", - "primaryip": "80.71.153.210", - "root_authorized_keys": "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFro/k4Mgqyh8yV/7Zwjc0dv60ZM7bROBU9JNd99P/4co6fxPt1pJiU/pEz2Dax/HODxgcO+jFZfvPEuLMCeAl0= YubiKey #10593996 PIV Slot 9a\nssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmXpOU6vzQiVSSYCoxHYv7wDxC63Qg3dxlAMR6AOzwIABCU5PFFNcO0NWYms/YR7MOViorl+19LCLRABar9JgHU1n+uqxKV6eGph3OPeMp5sN8LAh7C9N+TZj8iJzBxQ3ch+Z/LdmLRwYNJ7KSUI+gwGK6xRS3+z1022Y4P0G0sx7IeCBl4lealQEIIF10ZOfjUdBcLQar7XTc5AxyGKnHCerXHRtccCoadLQujk0AvPXbv3Ma4JwX9X++AnCWRWakqS5UInu2tGuZ/6Hrjd2a9AKWjTaBVDcbYqCvY4XVuMj2/A2bCceFBaoi41apybSk26FSFTU4qiEUNQ6lxeOwG4+1NCXyHe2bGI4VyoxinDYa8vLLzXIRfTRA0qoGfCweXNeWPf0jMqASkUKaSOH5Ot7O5ps34r0j9pWzavDid8QeKJPyhxKuF1a5G4iBEZ0O9vuti60dPSjJPci9oTxbune2/jb7Sa0yO06DtLFJ2ncr5f70s/BDxKk4XIwQLy+KsvzlQEGdY8yA6xv28bOGxL3sQ0HE2pDTsvIbAisVOKzdJeolStL9MM5W8Hg0r/KkGj2bg0TfoRp1xHV9hjKkvJrsQ6okaPvNFeZq0HXzPhWMOVQ+/46z80uaQ1ByRLr3FTwuWJ7F/73ndfxiq6bDE4z2Ji0vOjeWJm6HCxTdGw== hello@benjaminbaedorf.com\nssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDwyNsGCMuyI9x2IxYEbYIL6oYsEfe1wqhHaRxSnK9oc10ge1LJni5o7g6XgryoQpCD9YenImcCxwkKblmlLQ2327uoVC2PUo07li1uT0eIPk0TQoxwp6besFs7/LEzZlgWQsc3gkEXmjk/E0mu0U6z2fkqciJ/ZxWYt9fLP6jBG47U9878rSaZ7k7Ilv6oRA3suArH189k1nerk/tonS4EWXeHZxHh/Eu0tqwmxN/6+g2GicYn6b+MbFQVdQAkctqT5Yz9USm9UKzbaAuZ799u0dJzagHm9JJZOr8r11ENtAkY9kAzRzm3u/ACiSdVzyLdjAK6m0dIPhp3OhedzuHiI6/wRll60tYtQTH1XwUpVbtir3+DT+jwZgO1zH3yL4iNh79kuUo+UEg1ZmGkSZRzSS2vb5qr0J5aSJmCd5sNB7a01PTtSlQPOqSF9PB+UmcLDF7JoKFub0KT/gRZ5neZkXTYQ/Y05qtaaFVlOVISijnm+sLUvKBv6OW8oYXIHBk= ben@chocolatebar\nssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDoYNvXWunQYFORRjcYH1F98+zr20U79ROh+gmaC7AY/x3yf4y8uyMayF56VgQLVNwgEchT5t4dNb9qo2+1oUnjiKrKAVfQMN6WMMMEr4F4WT784uvBx5Uo6vmhgAa+xoo62c4TV2Uf49ZiPd+zAApBHW1F/whPtunPF28Wfr9g+ozSidhnAr+3nkfJh331tz9s+wgQ39AFzFWftQ60Guulpfj8SaVyxyv/yZZAuFpXNzN0Cz4fWBIWFOsib6Z8y+SlUCzSzOguZ7FygHjwlvOxoISsASAuf0OfUKHxVshiL5F5AX1ddmUgXbUKUTp/3Iunr74pfOQC8TXzZHqhrlFzYDmK5J9E6eADSpgx++bCCaHycl73BWeertCBZSHBXeb3Db9HX+mxwpfP3alVAt4ZqQb3YD/VB7XGDvHbmLn+wSfecO2qA9PxiA0yX7e2BZLN9r3G3bRNSk0GpnYM0i84FE9IipiKKnWVjj7J0UPQmz7rzAn2Lki1CnX9PDdxZneqTxgpBomHJt4H+vXMw13scA4xxEDBvfS5KkjbEJqWLbfklCoER6nV3NPLZ6CBl0Xe/VQBSkqEuUEIXih/oa8emDOGUODNF75ck5NJmKiGg6AFZoeiDa7PZMIxhhOq4vsR2Ty43rztUJ0CMX7iSIk3Eql7kqNdvrJaJ7z0GBsiw== ben@biolimo\nssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+euxPp6bHXw61UeUqTGHH8Ub2L+Sy1iteupv/AGudgoVNp2GebqJy1cxQ74mgnL8eWMlaA9jZlKQ1xFFhgtolCsoAKTE9AE8X0egvmEM18fEUR3EWWchmX4MXUhUiOtwitkl4+EpSsp5rh/kIxcpQFz1dpBibroq6jDLKlrVou+2LppR8nMfFT2sqg3694Ltxz4CWMdAfitLax05ckKMAnzz+TgpXK5OyfQSBvl18Qu1SWITYa6AVNXQ7/ovWBDIUfg25GWouzWqkSUpLdCVIcXPe2X7g6X1QsHXnnhaMAhvYH54GZ4wU2kBwIJ6KvplfZdbJ09KAltPVt08evafb hendriksokolowski@hsokolowski-pc\nssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII/58A18EtxnLYHu63c/+AyTSkJQSso/VVdHUFGp1CTk cardno:FFFE34353135\necdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOLcgrSOP0EB2PSqMrZWwUeZAME9ffRbUq6CgaGAuIehqVWHWUnHb4LvP6hOiJkpWxwUC/12ml15I90zczqVXig= b12f Yubi Main\necdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEST9eyAY3nzGYNnqDYfWHu+89LZsOjyKHMqCFvtP7vrgB7F7JbbECjdjAXEOfPDSCVwtMMpq8JJXeRMjpsD0rw= b12f Yubi Backup\nssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC/k0RRQgnvCHFtIEFnvCQJ5JgznuscJwhrDI3g5hvgBBeGD2UW/ZnR/nDgTE6Gbmvnn+0LRMEL1jtmYg7BUIE5ES2WAvgLYWEHMjaQlrqG68lGWTMKJyArhY9xR6kTANsBQ4vbGkDuM0Ww75lO4jYk6IHs5RtW27XHJIlTAzLYV1ux1J+EJ8Adfboa/+EK5oynsLgIWf8mYLo8RCQYc4kGZSbBPVFJ9gyzX7S6IQstPPgITLj1+RPzR9SyA58iPQt8/J2RFIPw7sN5LSlmg0CYGSU3oI2BZBPkxT7+zbrIvB0xFBiaUqSI2H/XlAMJReMVoAkuQA9KS1bz36EZirBfl5UniZbi8XNxwxriIRtfgnaU9zV8OZdBTvXUNyahyuof9RLRuR9HX+HJtPcDKJCooePzxbeOf0jNg+3efjMNOn9bd5T0OM3dAYJFwKWjudwsWmuVm2etf1evjOFn69EXXNU6Vu/jlZFIGIq0FRQNxQPdTJs61s9n7meqUXmtHZk= root@nougat\necdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHx4A8rLYmFgTOp1fDGbbONN8SOT0l5wWrUSYFUcVzMPTyfdT23ZVIdVD5yZCySgi/7PSh5mVmyLIZVIXlNrZJg= @b12f Yubi Main\n", - "tags": {}, - "timeouts": null, - "type": "virtualmachine", - "updated": null, - "user_data": "", - "user_script": "", - "volume": [] - }, - "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMCwidXBkYXRlIjo2MDAwMDAwMDAwMDB9fQ==", - "dependencies": [ - "data.triton_image.nixos", - "data.triton_network.private", - "data.triton_network.public" - ] - } - ] - } - ] -} - diff --git a/terraform/lev-1/terraform.tfstate.backup b/terraform/lev-1/terraform.tfstate.backup deleted file mode 100644 index 256ba70..0000000 --- a/terraform/lev-1/terraform.tfstate.backup +++ /dev/null @@ -1,327 +0,0 @@ -{ - "version": 4, - "terraform_version": "1.2.3", - "serial": 15, - "lineage": "0771640c-2fb8-2e08-c29e-2151710cb1dd", - "outputs": {}, - "resources": [ - { - "mode": "data", - "type": "triton_image", - "name": "nixos", - "provider": "provider[\"registry.terraform.io/joyent/triton\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "4c0be8bc-cbc9-660f-9736-c6a0fa0a894c", - "most_recent": true, - "name": "nixos-22", - "os": null, - "owner": null, - "public": null, - "state": null, - "type": null, - "version": null - }, - "sensitive_attributes": [] - } - ] - }, - { - "mode": "data", - "type": "triton_network", - "name": "private", - "provider": "provider[\"registry.terraform.io/joyent/triton\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "fabric": true, - "id": "3a8563cb-2930-49b2-954d-d81e0f68ce23", - "name": "My-Fabric-Network", - "public": false - }, - "sensitive_attributes": [] - } - ] - }, - { - "mode": "data", - "type": "triton_network", - "name": "public", - "provider": "provider[\"registry.terraform.io/joyent/triton\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "fabric": false, - "id": "b787ced8-84fd-4303-a320-53647979aa93", - "name": "public_ip_pool", - "public": true - }, - "sensitive_attributes": [] - } - ] - }, - { - "mode": "managed", - "type": "namecheap_domain_records", - "name": "pub-solar", - "provider": "provider[\"registry.terraform.io/namecheap/namecheap\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "domain": "pub.solar", - "email_type": "MX", - "id": "pub.solar", - "mode": "OVERWRITE", - "nameservers": null, - "record": [ - { - "address": "85.88.23.19", - "hostname": "mail", - "mx_pref": 10, - "ttl": 1799, - "type": "A" - }, - { - "address": "95.217.225.160", - "hostname": "cache", - "mx_pref": 10, - "ttl": 1799, - "type": "A" - }, - { - "address": "95.217.225.160", - "hostname": "collabora", - "mx_pref": 10, - "ttl": 1799, - "type": "A" - }, - { - "address": "infra-1.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone", - "hostname": "auth", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "infra-1.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone", - "hostname": "git", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "infra-1.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone", - "hostname": "infra-1", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "infra-1.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone", - "hostname": "vpn", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "mail.greenbaum.cloud", - "hostname": "@", - "mx_pref": 0, - "ttl": 1799, - "type": "MX" - }, - { - "address": "mail.pub.solar.", - "hostname": "imap", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "mail.pub.solar.", - "hostname": "smtp", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "mastodon-proxy.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "files", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "mastodon-proxy.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "mastodon", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "chat", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "dimension", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "element", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "matrix.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "matrix", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "nc-web.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone.", - "hostname": "cloud", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - }, - { - "address": "v=DMARC1; p=reject;", - "hostname": "_dmarc", - "mx_pref": 10, - "ttl": 1799, - "type": "TXT" - }, - { - "address": "v=spf1 a:mail.greenbaum.cloud ?all", - "hostname": "@", - "mx_pref": 10, - "ttl": 1799, - "type": "TXT" - }, - { - "address": "www.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "@", - "mx_pref": 10, - "ttl": 300, - "type": "ALIAS" - }, - { - "address": "www.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.cgn-1.greenbaum.zone.", - "hostname": "www", - "mx_pref": 10, - "ttl": 1799, - "type": "CNAME" - } - ] - }, - "sensitive_attributes": [], - "private": "bnVsbA==" - } - ] - }, - { - "mode": "managed", - "type": "triton_machine", - "name": "pub-solar-infra-vm-1", - "provider": "provider[\"registry.terraform.io/joyent/triton\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "administrator_pw": "", - "affinity": null, - "cloud_config": "", - "cns": [ - { - "disable": false, - "services": [ - "infra-1" - ] - } - ], - "compute_node": "1cc79e74-9554-e611-9234-0894ef22d041", - "created": null, - "dataset": "4c0be8bc-cbc9-660f-9736-c6a0fa0a894c", - "delegate_dataset": false, - "deletion_protection_enabled": false, - "disk": 245760, - "domain_names": [ - "d347ec63-9d45-43a6-a6ad-1b62740b65a3.inst.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone", - "pub-solar-infra-vm-1.inst.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.greenbaum.zone", - "d347ec63-9d45-43a6-a6ad-1b62740b65a3.inst.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone", - "my-fabric-network.d347ec63-9d45-43a6-a6ad-1b62740b65a3.inst.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone", - "pub-solar-infra-vm-1.inst.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone", - "my-fabric-network.pub-solar-infra-vm-1.inst.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone" - ], - "firewall_enabled": false, - "id": "d347ec63-9d45-43a6-a6ad-1b62740b65a3", - "image": "4c0be8bc-cbc9-660f-9736-c6a0fa0a894c", - "ips": [ - "80.71.153.210", - "192.168.128.57" - ], - "locality": [], - "memory": 16384, - "metadata": null, - "name": "pub-solar-infra-vm-1", - "networks": [ - "b787ced8-84fd-4303-a320-53647979aa93", - "3a8563cb-2930-49b2-954d-d81e0f68ce23" - ], - "nic": [ - { - "gateway": "192.168.128.1", - "ip": "192.168.128.57", - "mac": "90:b8:d0:88:8f:82", - "netmask": "255.255.252.0", - "network": "3a8563cb-2930-49b2-954d-d81e0f68ce23", - "primary": false, - "state": "stopped" - }, - { - "gateway": "80.71.153.1", - "ip": "80.71.153.210", - "mac": "90:b8:d0:26:a4:bc", - "netmask": "255.255.255.0", - "network": "cf3c73c2-7e07-4334-a1aa-c06f9e41ba48", - "primary": true, - "state": "running" - } - ], - "package": "bhyve-huge", - "primaryip": "80.71.153.210", - "root_authorized_keys": "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFro/k4Mgqyh8yV/7Zwjc0dv60ZM7bROBU9JNd99P/4co6fxPt1pJiU/pEz2Dax/HODxgcO+jFZfvPEuLMCeAl0= YubiKey #10593996 PIV Slot 9a\nssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmXpOU6vzQiVSSYCoxHYv7wDxC63Qg3dxlAMR6AOzwIABCU5PFFNcO0NWYms/YR7MOViorl+19LCLRABar9JgHU1n+uqxKV6eGph3OPeMp5sN8LAh7C9N+TZj8iJzBxQ3ch+Z/LdmLRwYNJ7KSUI+gwGK6xRS3+z1022Y4P0G0sx7IeCBl4lealQEIIF10ZOfjUdBcLQar7XTc5AxyGKnHCerXHRtccCoadLQujk0AvPXbv3Ma4JwX9X++AnCWRWakqS5UInu2tGuZ/6Hrjd2a9AKWjTaBVDcbYqCvY4XVuMj2/A2bCceFBaoi41apybSk26FSFTU4qiEUNQ6lxeOwG4+1NCXyHe2bGI4VyoxinDYa8vLLzXIRfTRA0qoGfCweXNeWPf0jMqASkUKaSOH5Ot7O5ps34r0j9pWzavDid8QeKJPyhxKuF1a5G4iBEZ0O9vuti60dPSjJPci9oTxbune2/jb7Sa0yO06DtLFJ2ncr5f70s/BDxKk4XIwQLy+KsvzlQEGdY8yA6xv28bOGxL3sQ0HE2pDTsvIbAisVOKzdJeolStL9MM5W8Hg0r/KkGj2bg0TfoRp1xHV9hjKkvJrsQ6okaPvNFeZq0HXzPhWMOVQ+/46z80uaQ1ByRLr3FTwuWJ7F/73ndfxiq6bDE4z2Ji0vOjeWJm6HCxTdGw== hello@benjaminbaedorf.com\nssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDwyNsGCMuyI9x2IxYEbYIL6oYsEfe1wqhHaRxSnK9oc10ge1LJni5o7g6XgryoQpCD9YenImcCxwkKblmlLQ2327uoVC2PUo07li1uT0eIPk0TQoxwp6besFs7/LEzZlgWQsc3gkEXmjk/E0mu0U6z2fkqciJ/ZxWYt9fLP6jBG47U9878rSaZ7k7Ilv6oRA3suArH189k1nerk/tonS4EWXeHZxHh/Eu0tqwmxN/6+g2GicYn6b+MbFQVdQAkctqT5Yz9USm9UKzbaAuZ799u0dJzagHm9JJZOr8r11ENtAkY9kAzRzm3u/ACiSdVzyLdjAK6m0dIPhp3OhedzuHiI6/wRll60tYtQTH1XwUpVbtir3+DT+jwZgO1zH3yL4iNh79kuUo+UEg1ZmGkSZRzSS2vb5qr0J5aSJmCd5sNB7a01PTtSlQPOqSF9PB+UmcLDF7JoKFub0KT/gRZ5neZkXTYQ/Y05qtaaFVlOVISijnm+sLUvKBv6OW8oYXIHBk= ben@chocolatebar\nssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDoYNvXWunQYFORRjcYH1F98+zr20U79ROh+gmaC7AY/x3yf4y8uyMayF56VgQLVNwgEchT5t4dNb9qo2+1oUnjiKrKAVfQMN6WMMMEr4F4WT784uvBx5Uo6vmhgAa+xoo62c4TV2Uf49ZiPd+zAApBHW1F/whPtunPF28Wfr9g+ozSidhnAr+3nkfJh331tz9s+wgQ39AFzFWftQ60Guulpfj8SaVyxyv/yZZAuFpXNzN0Cz4fWBIWFOsib6Z8y+SlUCzSzOguZ7FygHjwlvOxoISsASAuf0OfUKHxVshiL5F5AX1ddmUgXbUKUTp/3Iunr74pfOQC8TXzZHqhrlFzYDmK5J9E6eADSpgx++bCCaHycl73BWeertCBZSHBXeb3Db9HX+mxwpfP3alVAt4ZqQb3YD/VB7XGDvHbmLn+wSfecO2qA9PxiA0yX7e2BZLN9r3G3bRNSk0GpnYM0i84FE9IipiKKnWVjj7J0UPQmz7rzAn2Lki1CnX9PDdxZneqTxgpBomHJt4H+vXMw13scA4xxEDBvfS5KkjbEJqWLbfklCoER6nV3NPLZ6CBl0Xe/VQBSkqEuUEIXih/oa8emDOGUODNF75ck5NJmKiGg6AFZoeiDa7PZMIxhhOq4vsR2Ty43rztUJ0CMX7iSIk3Eql7kqNdvrJaJ7z0GBsiw== ben@biolimo\nssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+euxPp6bHXw61UeUqTGHH8Ub2L+Sy1iteupv/AGudgoVNp2GebqJy1cxQ74mgnL8eWMlaA9jZlKQ1xFFhgtolCsoAKTE9AE8X0egvmEM18fEUR3EWWchmX4MXUhUiOtwitkl4+EpSsp5rh/kIxcpQFz1dpBibroq6jDLKlrVou+2LppR8nMfFT2sqg3694Ltxz4CWMdAfitLax05ckKMAnzz+TgpXK5OyfQSBvl18Qu1SWITYa6AVNXQ7/ovWBDIUfg25GWouzWqkSUpLdCVIcXPe2X7g6X1QsHXnnhaMAhvYH54GZ4wU2kBwIJ6KvplfZdbJ09KAltPVt08evafb hendriksokolowski@hsokolowski-pc\nssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII/58A18EtxnLYHu63c/+AyTSkJQSso/VVdHUFGp1CTk cardno:FFFE34353135\necdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOLcgrSOP0EB2PSqMrZWwUeZAME9ffRbUq6CgaGAuIehqVWHWUnHb4LvP6hOiJkpWxwUC/12ml15I90zczqVXig= b12f Yubi Main\necdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEST9eyAY3nzGYNnqDYfWHu+89LZsOjyKHMqCFvtP7vrgB7F7JbbECjdjAXEOfPDSCVwtMMpq8JJXeRMjpsD0rw= b12f Yubi Backup\nssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC/k0RRQgnvCHFtIEFnvCQJ5JgznuscJwhrDI3g5hvgBBeGD2UW/ZnR/nDgTE6Gbmvnn+0LRMEL1jtmYg7BUIE5ES2WAvgLYWEHMjaQlrqG68lGWTMKJyArhY9xR6kTANsBQ4vbGkDuM0Ww75lO4jYk6IHs5RtW27XHJIlTAzLYV1ux1J+EJ8Adfboa/+EK5oynsLgIWf8mYLo8RCQYc4kGZSbBPVFJ9gyzX7S6IQstPPgITLj1+RPzR9SyA58iPQt8/J2RFIPw7sN5LSlmg0CYGSU3oI2BZBPkxT7+zbrIvB0xFBiaUqSI2H/XlAMJReMVoAkuQA9KS1bz36EZirBfl5UniZbi8XNxwxriIRtfgnaU9zV8OZdBTvXUNyahyuof9RLRuR9HX+HJtPcDKJCooePzxbeOf0jNg+3efjMNOn9bd5T0OM3dAYJFwKWjudwsWmuVm2etf1evjOFn69EXXNU6Vu/jlZFIGIq0FRQNxQPdTJs61s9n7meqUXmtHZk= root@nougat\necdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHx4A8rLYmFgTOp1fDGbbONN8SOT0l5wWrUSYFUcVzMPTyfdT23ZVIdVD5yZCySgi/7PSh5mVmyLIZVIXlNrZJg= @b12f Yubi Main\n", - "tags": null, - "timeouts": null, - "type": "virtualmachine", - "updated": null, - "user_data": "", - "user_script": "", - "volume": [] - }, - "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJyZWFkIjozMDAwMDAwMDAwMCwidXBkYXRlIjo2MDAwMDAwMDAwMDB9fQ==", - "dependencies": [ - "data.triton_image.nixos", - "data.triton_network.private", - "data.triton_network.public" - ] - } - ] - } - ] -}