From ebe3ecbd9eed799b36ee00469b1cde10d0c2717c Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Tue, 21 Aug 2018 08:46:25 +0530
Subject: [PATCH] rss-bridge: Migrate to container module

---
 main.tf                   |  7 -------
 modules/container/main.tf |  1 +
 modules/container/vars.tf |  6 ++++++
 rss-bridge.tf             | 35 +++++++++++++++++++++++++++++++++++
 rss-bridge/main.tf        | 30 ------------------------------
 rss-bridge/variables.tf   |  9 ---------
 rss-bridge/whitelist.txt  | 16 ----------------
 7 files changed, 42 insertions(+), 62 deletions(-)
 create mode 100644 rss-bridge.tf
 delete mode 100644 rss-bridge/main.tf
 delete mode 100644 rss-bridge/variables.tf
 delete mode 100644 rss-bridge/whitelist.txt

diff --git a/main.tf b/main.tf
index 0053f56..7aa8c1f 100644
--- a/main.tf
+++ b/main.tf
@@ -61,13 +61,6 @@ module "radicale" {
   traefik-network-id = "${module.docker.traefik-network-id}"
 }
 
-module "rss-bridge" {
-  source             = "rss-bridge"
-  domain             = "rss-bridge.bb8.fun"
-  traefik-labels     = "${var.traefik-common-labels}"
-  traefik-network-id = "${module.docker.traefik-network-id}"
-}
-
 module "resilio" {
   source             = "resilio"
   domain             = "sync.bb8.fun"
diff --git a/modules/container/main.tf b/modules/container/main.tf
index a1245fb..20d3d73 100644
--- a/modules/container/main.tf
+++ b/modules/container/main.tf
@@ -21,6 +21,7 @@ resource "docker_container" "container" {
   memory = "${local.resource["memory"]}"
 
   volumes = "${var.volumes}"
+  upload  = "${var.uploads}"
 
   # Look at this monstrosity
   # And then https://github.com/hashicorp/terraform/issues/12453#issuecomment-365569618
diff --git a/modules/container/vars.tf b/modules/container/vars.tf
index 0540ab0..6b93876 100644
--- a/modules/container/vars.tf
+++ b/modules/container/vars.tf
@@ -88,3 +88,9 @@ variable "volumes" {
   type        = "list"
   default     = []
 }
+
+variable "uploads" {
+  description = "uploads"
+  type        = "list"
+  default     = []
+}
diff --git a/rss-bridge.tf b/rss-bridge.tf
new file mode 100644
index 0000000..b70bbad
--- /dev/null
+++ b/rss-bridge.tf
@@ -0,0 +1,35 @@
+module "rss-bridge" {
+  name   = "rss-bridge"
+  source = "modules/container"
+  image  = "rssbridge/rss-bridge:latest"
+
+  web {
+    expose = true
+    host   = "rss-bridge.${var.root-domain}"
+  }
+
+  networks = "${list(module.docker.traefik-network-id)}"
+
+  uploads = [{
+    content = <<EOF
+AmazonBridge
+BandcampBridge
+ContainerLinuxReleasesBridge
+DiscogsBridge
+FDroidBridge
+FacebookBridge
+GithubIssueBridge
+GithubSearchBridge
+GoComicsBridge
+GoogleSearchBridge
+InstagramBridge
+ReadComicsBridge
+SoundcloudBridge
+SteamBridge
+StripeAPIChangeLogBridge
+AmazonPriceTrackerBridge
+EOF
+
+    file = "/app/public/whitelist.txt"
+  }]
+}
diff --git a/rss-bridge/main.tf b/rss-bridge/main.tf
deleted file mode 100644
index 8ba8b79..0000000
--- a/rss-bridge/main.tf
+++ /dev/null
@@ -1,30 +0,0 @@
-data "docker_registry_image" "rss-bridge" {
-  name = "rssbridge/rss-bridge:latest"
-}
-
-resource "docker_image" "rss-bridge" {
-  name          = "${data.docker_registry_image.rss-bridge.name}"
-  pull_triggers = ["${data.docker_registry_image.rss-bridge.sha256_digest}"]
-}
-
-resource "docker_container" "rss-bridge" {
-  name  = "rss-bridge"
-  image = "${docker_image.rss-bridge.latest}"
-
-  labels = "${merge(
-    var.traefik-labels, map(
-      "traefik.port", 80,
-      "traefik.frontend.rule","Host:${var.domain}"
-  ))}"
-
-  upload {
-    content = "${file("${path.module}/whitelist.txt")}"
-    file    = "/app/public/whitelist.txt"
-  }
-
-  networks = ["${var.traefik-network-id}"]
-
-  restart               = "unless-stopped"
-  destroy_grace_seconds = 60
-  must_run              = true
-}
diff --git a/rss-bridge/variables.tf b/rss-bridge/variables.tf
deleted file mode 100644
index 7fc62b1..0000000
--- a/rss-bridge/variables.tf
+++ /dev/null
@@ -1,9 +0,0 @@
-variable "domain" {
-  description = "domain to be used by traefik"
-}
-
-variable "traefik-labels" {
-  type = "map"
-}
-
-variable "traefik-network-id" {}
diff --git a/rss-bridge/whitelist.txt b/rss-bridge/whitelist.txt
deleted file mode 100644
index 7b421f5..0000000
--- a/rss-bridge/whitelist.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-AmazonBridge
-BandcampBridge
-ContainerLinuxReleasesBridge
-DiscogsBridge
-FDroidBridge
-FacebookBridge
-GithubIssueBridge
-GithubSearchBridge
-GoComicsBridge
-GoogleSearchBridge
-InstagramBridge
-ReadComicsBridge
-SoundcloudBridge
-SteamBridge
-StripeAPIChangeLogBridge
-AmazonPriceTrackerBridge