From 7c6abc33fe26b1c8ed445e41923aaafe09217c20 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sun, 26 Apr 2020 14:26:48 +0100
Subject: [PATCH] Host website outside home

---
 ansible/main.yml                                   |  4 ++++
 ansible/roles/intersect-docker/tasks/main.yml      |  3 ---
 .../files}/docker-compose.yml                      |  0
 .../tasks/main.yml}                                |  8 ++++----
 terraform/grimes_vps.tf                            | 14 ++++++++++++++
 terraform/theorangeone.net.tf                      |  4 ++--
 6 files changed, 24 insertions(+), 9 deletions(-)
 rename ansible/roles/{intersect-docker/files/theorangeone.net => website/files}/docker-compose.yml (100%)
 rename ansible/roles/{intersect-docker/tasks/theorangeone.net.yml => website/tasks/main.yml} (77%)

diff --git a/ansible/main.yml b/ansible/main.yml
index 208ecb1..863f917 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -30,3 +30,7 @@
 - hosts: intersect
   roles:
     - intersect-docker
+
+- hosts: grimes
+  roles:
+    - website
diff --git a/ansible/roles/intersect-docker/tasks/main.yml b/ansible/roles/intersect-docker/tasks/main.yml
index 54ade26..456a3fd 100644
--- a/ansible/roles/intersect-docker/tasks/main.yml
+++ b/ansible/roles/intersect-docker/tasks/main.yml
@@ -40,9 +40,6 @@
 - name: Install torrent
   include: torrent.yml
 
-- name: Install theorangeone.net
-  include: theorangeone.net.yml
-
 - name: Install tt-rss
   include: tt-rss.yml
 
diff --git a/ansible/roles/intersect-docker/files/theorangeone.net/docker-compose.yml b/ansible/roles/website/files/docker-compose.yml
similarity index 100%
rename from ansible/roles/intersect-docker/files/theorangeone.net/docker-compose.yml
rename to ansible/roles/website/files/docker-compose.yml
diff --git a/ansible/roles/intersect-docker/tasks/theorangeone.net.yml b/ansible/roles/website/tasks/main.yml
similarity index 77%
rename from ansible/roles/intersect-docker/tasks/theorangeone.net.yml
rename to ansible/roles/website/tasks/main.yml
index 0784095..7132681 100644
--- a/ansible/roles/intersect-docker/tasks/theorangeone.net.yml
+++ b/ansible/roles/website/tasks/main.yml
@@ -1,4 +1,4 @@
-- name: Create theorangeone.net directory
+- name: Create install directory
   file:
     path: /opt/theorangeone.net
     state: directory
@@ -6,9 +6,9 @@
     mode: "{{ docker_compose_directory_mask }}"
   become: true
 
-- name: Install theorangeone.net compose file
+- name: Install compose file
   template:
-    src: files/theorangeone.net/docker-compose.yml
+    src: files/docker-compose.yml
     dest: /opt/theorangeone.net/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
@@ -16,7 +16,7 @@
   register: compose_file
   become: true
 
-- name: Cycle theorangeone.net container
+- name: Cycle container
   docker_compose:
     project_src: /opt/theorangeone.net
     pull: true
diff --git a/terraform/grimes_vps.tf b/terraform/grimes_vps.tf
index cbed6d6..d850853 100644
--- a/terraform/grimes_vps.tf
+++ b/terraform/grimes_vps.tf
@@ -15,3 +15,17 @@ resource "vultr_firewall_rule" "grimes_ping" {
   protocol          = "icmp"
   network           = "0.0.0.0/0"
 }
+
+resource "vultr_firewall_rule" "grimes_web" {
+  firewall_group_id = vultr_firewall_group.grimes.id
+  protocol          = "tcp"
+  from_port         = 80
+  network           = "0.0.0.0/0"
+}
+
+resource "vultr_firewall_rule" "grimes_web_secure" {
+  firewall_group_id = vultr_firewall_group.grimes.id
+  protocol          = "tcp"
+  from_port         = 443
+  network           = "0.0.0.0/0"
+}
diff --git a/terraform/theorangeone.net.tf b/terraform/theorangeone.net.tf
index 61de17a..0a5f4bf 100644
--- a/terraform/theorangeone.net.tf
+++ b/terraform/theorangeone.net.tf
@@ -87,7 +87,7 @@ resource "cloudflare_record" "theorangeonenet_dkim_fm3" {
 resource "cloudflare_record" "theorangeonenet_www" {
   zone_id = cloudflare_zone.theorangeonenet.id
   name    = "www"
-  value   = vultr_server.casey.main_ip
+  value   = vultr_server.grimes.main_ip
   type    = "A"
   ttl     = 1
 }
@@ -95,7 +95,7 @@ resource "cloudflare_record" "theorangeonenet_www" {
 resource "cloudflare_record" "theorangeonenet_apex" {
   zone_id = cloudflare_zone.theorangeonenet.id
   name    = "@"
-  value   = vultr_server.casey.main_ip
+  value   = vultr_server.grimes.main_ip
   type    = "A"
   ttl     = 1
 }