.env.dist

@@ -1 +0,0 @@
-../.env.dist

.htaccess

@@ -1 +0,0 @@
-Require all denied

Taskfile.yaml

@@ -22,8 +22,8 @@ tasks:
   default:
     - task: services
 
-  run: ssh -qtt "$stashbox_domain" '{{.command}}'
-  run-root: ssh -qtt "$stashbox_domain" 'su -l root -c "{{.command}}"'
+  run: ssh -qtt othostash.com '{{.command}}'
+  run-root: ssh -qtt othostash.com 'su -l root -c "{{.command}}"'
 
   exec:
     - task: run
@@ -82,19 +82,10 @@ tasks:
         vars:
           remote_path: "{{.ITEM}}"
 
-  # Terraform
-  plan:
-    - task: tf
-      vars:
-        CLI_ARGS: plan
-  apply:
-    - task: tf
-      vars:
-        CLI_ARGS: apply
-  tf: source .env; terraform init; terraform {{.CLI_ARGS}}
+  plan: source .env; terraform init; terraform plan
+  migrate-state: terraform init -migrate-state
 
   # Utilities
-  printenv: source .env; printenv
   path-update: echo scp "{{.local_path}}" "$stashbox_domain:{{.remote_path}}"
   path-backup: scp "$stashbox_domain:{{.remote_path}}" "./.$(basename {{.remote_path}})-$(date +%s)" || echo "No file found."
   path-diff:

dns.tf

@@ -10,62 +10,71 @@ terraform {
 
 provider "namecheap" {}
 
-variable "stashbox_domain" {
+variable "stash_domain" {
   type    = string
   default = "web.stash"
 }
 
-variable "stashbox_web_addr" {
+variable "web_addr" {
   type    = string
   default = "::db"
 }
 
-variable "stashbox_feed_addr" {
+variable "feed_addr" {
   type    = string
   default = "::feed"
 }
 
-variable "stashbox_ip4_ext" {
+variable "app_addr" {
+  type    = string
+  default = "::beef"
+}
+
+variable "ip4_ext" {
   type    = string
   default = "0.0.0.0"
 }
 
-resource "namecheap_domain_records" "stashbox" {
-  domain = var.stashbox_domain
+resource "namecheap_domain_records" "stash" {
+  domain = var.stash_domain
   record {
     hostname = "www"
-    address  = var.stashbox_web_addr
+    address  = var.web_addr
     type     = "AAAA"
-    ttl      = 1799
   }
   record {
     hostname = "www"
-    address  = var.stashbox_ip4_ext
+    address  = var.ip4_ext
     type     = "A"
-    ttl      = 1799
   }
   record {
     hostname = "feed"
-    address  = var.stashbox_feed_addr
+    address  = var.feed_addr
     type     = "AAAA"
-    ttl      = 1799
   }
   record {
     hostname = "feed"
-    address  = var.stashbox_ip4_ext
+    address  = var.ip4_ext
+    type     = "A"
+  }
+  record {
+    hostname = "app"
+    address  = var.app_addr
+    type     = "AAAA"
+  }
+  record {
+    hostname = "app"
+    address  = var.ip4_ext
     type     = "A"
-    ttl      = 1799
   }
   record {
     hostname = "@"
-    address  = "www.${var.stashbox_domain}."
+    address  = "www.${var.stash_domain}"
     type     = "CNAME"
-    ttl      = 1799
   }
   record {
     hostname = "plex"
-    address  = "feed.${var.stashbox_domain}."
+    address  = "feed.${var.stash_domain}"
     type     = "CNAME"
-    ttl      = 1799
   }
 }