From 8b79626ad1428a557b840ba6d7bf7590c2807708 Mon Sep 17 00:00:00 2001
From: Jason Ross <jason.ross841@outlook.com>
Date: Sat, 9 May 2026 22:30:03 -0500
Subject: [PATCH] fixes

---
 .gitignore               |  3 +++
 tofu/backend.hcl.example | 12 ------------
 tofu/server.tf           | 16 ++++++++--------
 tofu/versions.tf         |  2 +-
 4 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 tofu/backend.hcl.example

diff --git a/.gitignore b/.gitignore
index 1bd9cf5..f69041e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ ansible/inventory/hosts.yml
 ansible/group_vars/**/vault.yml
 wireguard/wg0.conf
 wireguard/peers/
+.aws/
+.env
 
 # OpenTofu / Terraform
 .terraform/
@@ -24,6 +26,7 @@ crash.log
 crash.*.log
 override.tf
 override.tf.json
+backend.hcl
 *_override.tf
 *_override.tf.json
 
diff --git a/tofu/backend.hcl.example b/tofu/backend.hcl.example
deleted file mode 100644
index b472aed..0000000
--- a/tofu/backend.hcl.example
+++ /dev/null
@@ -1,12 +0,0 @@
-# Initialize OpenTofu state in Cloudflare R2:
-#
-#   export AWS_ACCESS_KEY_ID=<R2_ACCESS_KEY>
-#   export AWS_SECRET_ACCESS_KEY=<R2_SECRET_KEY>
-#   tofu init -backend-config=backend.hcl
-#
-# Replace <ACCOUNT_ID> with your Cloudflare account ID.
-# Create the R2 bucket "watchtower-tofu-state" in Cloudflare dashboard first.
-
-endpoints = {
-  s3 = "https://<ACCOUNT_ID>.r2.cloudflarestorage.com"
-}
diff --git a/tofu/server.tf b/tofu/server.tf
index 486745e..596fd1e 100644
--- a/tofu/server.tf
+++ b/tofu/server.tf
@@ -31,17 +31,17 @@ resource "hcloud_firewall" "watchtower" {
 }
 
 resource "hcloud_primary_ip" "ipv4" {
-  name        = "${var.server_name}-ipv4"
-  type        = "ipv4"
-  datacenter  = "${var.location}-dc3"
-  auto_delete = false
+  name            = "${var.server_name}-ipv4"
+  type            = "ipv4"
+  assignee_type   = "server"
+  auto_delete     = false
 }
 
 resource "hcloud_primary_ip" "ipv6" {
-  name        = "${var.server_name}-ipv6"
-  type        = "ipv6"
-  datacenter  = "${var.location}-dc3"
-  auto_delete = false
+  name            = "${var.server_name}-ipv6"
+  type            = "ipv6"
+  assignee_type   = "server"
+  auto_delete     = false
 }
 
 resource "hcloud_server" "watchtower" {
diff --git a/tofu/versions.tf b/tofu/versions.tf
index eb8a864..45d2d15 100644
--- a/tofu/versions.tf
+++ b/tofu/versions.tf
@@ -27,7 +27,7 @@ terraform {
   # use_lockfile = true requires OpenTofu >= 1.10 and provides native S3-based
   # state locking via conditional PutObject (no DynamoDB needed; R2-compatible).
   backend "s3" {
-    bucket = "watchtower-tofu-state"
+    bucket = "watchtower-observability-opentofu-state"
     key    = "watchtower/terraform.tfstate"
     region = "auto"