From e20b5c5a44a83c129e7ddf875a96bc03071a1883 Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Mon, 27 Nov 2017 11:59:24 +0530
Subject: [PATCH] Removing memory limits works, unfortunately

---
 docker/conf/traefik.toml |  4 +++-
 docker/conf/wiki.yml     |  2 +-
 docker/main.tf           | 16 ++++++----------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/docker/conf/traefik.toml b/docker/conf/traefik.toml
index 1f08dff..e2d5403 100644
--- a/docker/conf/traefik.toml
+++ b/docker/conf/traefik.toml
@@ -32,6 +32,8 @@ defaultEntryPoints = ["http", "https"]
 [frontends.ebooks]
   backend = "ebooks"
   passHostHeader = true
+  [frontends.ebooks.headers.customrequestheaders]
+    X-Forwarded-Proto = "https"
 [frontends.ebooks.routes.domain]
   rule = "Host:ebooks.in.bb8.fun,ebooks.bb8.fun"
 
@@ -53,7 +55,7 @@ dnsProvider = "cloudflare"
 onHostRule = false
 onDemand   = false
 
-# Waiting till december to get wildcard SSL on LE
+# Waiting till Jan '18 to get wildcard SSL on LE
 [[acme.domains]]
 main = "in.bb8.fun"
 sans = ["emby.in.bb8.fun", "airsonic.in.bb8.fun", "muximux.in.bb8.fun", "home.in.bb8.fun"]
diff --git a/docker/conf/wiki.yml b/docker/conf/wiki.yml
index 6f025ad..c415b0a 100644
--- a/docker/conf/wiki.yml
+++ b/docker/conf/wiki.yml
@@ -16,7 +16,7 @@ title: Nemo's Wiki
 # ---------------------------------------------------------------------
 # INCLUDE CLIENT PORT IF NOT 80/443!
 
-host: http://wiki.in.bb8.fun:8888
+host: https://wiki.bb8.fun
 
 # ---------------------------------------------------------------------
 # Port the main server should listen to (80 by default)
diff --git a/docker/main.tf b/docker/main.tf
index eb94600..dd88d02 100644
--- a/docker/main.tf
+++ b/docker/main.tf
@@ -301,7 +301,6 @@ resource "docker_container" "airsonic" {
   destroy_grace_seconds = 30
   must_run = true
   user = "1004"
-  memory = 512
 
   volumes {
     host_path      = "/mnt/xwing/config/airsonic/data"
@@ -338,7 +337,6 @@ resource "docker_container" "sickrage" {
   restart = "unless-stopped"
   destroy_grace_seconds = 10
   must_run = true
-  memory = 256
 
   volumes {
     host_path      = "/mnt/xwing/config/sickrage"
@@ -411,10 +409,8 @@ resource "docker_container" "wiki" {
   name  = "wiki"
   image = "${docker_image.wikijs.latest}"
 
-  # This is the wiki user account
-  user  = "1006"
   restart = "unless-stopped"
-  destroy_grace_seconds = 10
+  destroy_grace_seconds = 30
   must_run = true
 
   upload {
@@ -422,11 +418,6 @@ resource "docker_container" "wiki" {
     file    = "/var/wiki/config.yml"
   }
 
-  volumes {
-    host_path       = "/mnt/xwing/data/wiki/data"
-    container_path  = "/data"
-  }
-
   volumes {
     host_path       = "/mnt/xwing/logs/wiki"
     container_path  = "/logs"
@@ -437,6 +428,11 @@ resource "docker_container" "wiki" {
     container_path  = "/repo"
   }
 
+  volumes {
+    host_path       = "/mnt/xwing/data/wiki/data"
+    container_path  = "/data"
+  }
+
   labels {
     "traefik.port" = 9999
     "traefik.enable" = "true"