From 2b2b68f7225ab662d95410232caeda53fe7df4d9 Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Sun, 11 Aug 2019 21:40:29 +0530
Subject: [PATCH] General Updates
---
heimdall.tf | 34 +++++++++++++++++-----------------
jupyter.tf | 24 ++++++++++++------------
main.tf | 28 ++++++++++++++++------------
monicahq.tf | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
outline.tf | 21 +++++++++++----------
pulse.tf | 50 ++++++++++++++++++++++++++------------------------
requestbin.tf | 14 --------------
gitea/data.tf | 2 +-
media/bazarr.tf | 39 +++++++++++++++++++++++++++++++++++++++
media/mylar.tf | 35 +++++++++++++++++++++++++++++++++++
10 files changed, 209 insertions(+), 159 deletions(-)
diff --git a/heimdall.tf b/heimdall.tf
index b1c3747..ef6a5da 100644
--- a/heimdall.tf
+++ a/heimdall.tf
@@ -1,19 +1,17 @@
-module "heimdall" {
- name = "heimdall"
- source = "modules/container"
- image = "linuxserver/heimdall:latest"
+# module "heimdall" {
+# name = "heimdall"
+# source = "modules/container"
+# image = "linuxserver/heimdall:latest"
+# web {
+# expose = true
+# port = 443
+# protocol = "https"
+# basicauth = "true"
+# host = "home.bb8.fun"
+# }
+# networks = "${list(module.docker.traefik-network-id)}"
+# env = [
+# "TZ=Asia/Kolkata",
+# ]
+# }
- web {
- expose = true
- port = 443
- protocol = "https"
- basicauth = "true"
- host = "home.bb8.fun"
- }
-
- networks = "${list(module.docker.traefik-network-id)}"
-
- env = [
- "TZ=Asia/Kolkata",
- ]
-}
diff --git a/jupyter.tf b/jupyter.tf
index a664aaf..43cc05a 100644
--- a/jupyter.tf
+++ a/jupyter.tf
@@ -1,13 +1,13 @@
-module "jupyter" {
- name = "jupyter"
- source = "modules/container"
- image = "jupyter/tensorflow-notebook"
+# module "jupyter" {
+# name = "jupyter"
+# source = "modules/container"
+# image = "jupyter/tensorflow-notebook"
+# ports = [
+# {
+# internal = 8888
+# external = 1112
+# ip = "${var.ips["tun0"]}"
+# },
+# ]
+# }
- ports = [
- {
- internal = 8888
- external = 1112
- ip = "${var.ips["tun0"]}"
- },
- ]
-}
diff --git a/main.tf b/main.tf
index 2e74634..a5d68a2 100644
--- a/main.tf
+++ a/main.tf
@@ -63,13 +63,13 @@
domain = "radicale.bb8.fun"
}
-module "resilio" {
- source = "resilio"
- domain = "sync.bb8.fun"
- traefik-labels = "${var.traefik-common-labels}"
- ips = "${var.ips}"
- traefik-network-id = "${module.docker.traefik-network-id}"
-}
+# module "resilio" {
+# source = "resilio"
+# domain = "sync.bb8.fun"
+# traefik-labels = "${var.traefik-common-labels}"
+# ips = "${var.ips}"
+# traefik-network-id = "${module.docker.traefik-network-id}"
+# }
module "media" {
source = "media"
@@ -100,9 +100,11 @@
# ips = "${var.ips}"
# }
-module "abstruse" {
- source = "abstruse"
- domain = "ci.bb8.fun"
- traefik-labels = "${var.traefik-common-labels}"
- traefik-network-id = "${module.docker.traefik-network-id}"
-}
+
+# module "abstruse" {
+# source = "abstruse"
+# domain = "ci.bb8.fun"
+# traefik-labels = "${var.traefik-common-labels}"
+# traefik-network-id = "${module.docker.traefik-network-id}"
+# }
+
diff --git a/monicahq.tf b/monicahq.tf
index 0a498a0..6874a07 100644
--- a/monicahq.tf
+++ a/monicahq.tf
@@ -1,65 +1,58 @@
-module "monicahq-container" {
- name = "monica"
- source = "modules/container"
- image = "monicahq/monicahq:latest"
+# module "monicahq-container" {
+# name = "monica"
+# source = "modules/container"
+# image = "monicahq/monicahq:latest"
+# web {
+# expose = true
+# host = "monica.${var.root-domain}"
+# }
+# networks = "${list(module.docker.traefik-network-id,module.db.postgres-network-id)}"
+# env = [
+# "APP_ENV=production",
+# "APP_DEBUG=false",
+# "APP_KEY=${data.pass_password.monica-app-key.password}",
+# "HASH_SALT=${data.pass_password.monica-hash-salt.password}",
+# "HASH_LENGTH=18",
+# "APP_URL=https://monica.${var.root-domain}",
+# "DB_CONNECTION=pgsql",
+# "DB_HOST=postgres",
+# "DB_DATABASE=monica",
+# "DB_PORT=5432",
+# "DB_USERNAME=monica",
+# "DB_PASSWORD=${data.pass_password.monica-db-password.password}",
+# "DB_PREFIX=",
+# "MAIL_DRIVER=smtp",
+# "MAIL_HOST=smtp.mailgun.org",
+# "MAIL_PORT=587",
+# "MAIL_USERNAME=monica@captnemo.in",
+# "MAIL_PASSWORD=${data.pass_password.monica-smtp-password.password}",
+# "MAIL_ENCRYPTION=tls",
+# "MAIL_FROM_ADDRESS=monica@captnemo.in",
+# "MAIL_FROM_NAME=Nemo",
+# "APP_EMAIL_NEW_USERS_NOTIFICATION=monica@captnemo.in",
+# "APP_DEFAULT_TIMEZONE=Asia/Kolkata",
+# "APP_DEFAULT_LOCALE=en",
+# # Ability to disable signups on your instance.
+# # Can be true or false. Default to false.
+# "APP_DISABLE_SIGNUP=false",
+# "LOG_CHANNEL=single",
+# "SENTRY_SUPPORT=false",
+# "CHECK_VERSION=true",
+# "REQUIRES_SUBSCRIPTION=false",
+# # cache redis is not yet documented
+# "CACHE_DRIVER=database",
+# "SESSION_DRIVER=file",
+# "SESSION_LIFETIME=120",
+# "QUEUE_DRIVER=sync",
+# "DEFAULT_FILESYSTEM=public",
+# "2FA_ENABLED=true",
+# "ALLOW_STATISTICS_THROUGH_PUBLIC_API_ACCESS=false",
+# "APP_TRUSTED_PROXIES=*",
+# ]
+# }
+# module "monicahq-db" {
+# source = "modules/postgres"
+# name = "monica"
+# password = "${data.pass_password.monica-db-password.password}"
+# }
- web {
- expose = true
- host = "monica.${var.root-domain}"
- }
-
- networks = "${list(module.docker.traefik-network-id,module.db.postgres-network-id)}"
-
- env = [
- "APP_ENV=production",
- "APP_DEBUG=false",
- "APP_KEY=${data.pass_password.monica-app-key.password}",
- "HASH_SALT=${data.pass_password.monica-hash-salt.password}",
- "HASH_LENGTH=18",
- "APP_URL=https://monica.${var.root-domain}",
- "DB_CONNECTION=pgsql",
- "DB_HOST=postgres",
- "DB_DATABASE=monica",
- "DB_PORT=5432",
- "DB_USERNAME=monica",
- "DB_PASSWORD=${data.pass_password.monica-db-password.password}",
- "DB_PREFIX=",
- "MAIL_DRIVER=smtp",
- "MAIL_HOST=smtp.mailgun.org",
- "MAIL_PORT=587",
- "MAIL_USERNAME=monica@captnemo.in",
- "MAIL_PASSWORD=${data.pass_password.monica-smtp-password.password}",
- "MAIL_ENCRYPTION=tls",
- "MAIL_FROM_ADDRESS=monica@captnemo.in",
- "MAIL_FROM_NAME=Nemo",
- "APP_EMAIL_NEW_USERS_NOTIFICATION=monica@captnemo.in",
- "APP_DEFAULT_TIMEZONE=Asia/Kolkata",
- "APP_DEFAULT_LOCALE=en",
-
- # Ability to disable signups on your instance.
- # Can be true or false. Default to false.
- "APP_DISABLE_SIGNUP=false",
-
- "LOG_CHANNEL=single",
- "SENTRY_SUPPORT=false",
- "CHECK_VERSION=true",
- "REQUIRES_SUBSCRIPTION=false",
-
- # cache redis is not yet documented
- "CACHE_DRIVER=database",
-
- "SESSION_DRIVER=file",
- "SESSION_LIFETIME=120",
- "QUEUE_DRIVER=sync",
- "DEFAULT_FILESYSTEM=public",
- "2FA_ENABLED=true",
- "ALLOW_STATISTICS_THROUGH_PUBLIC_API_ACCESS=false",
- "APP_TRUSTED_PROXIES=*",
- ]
-}
-
-module "monicahq-db" {
- source = "modules/postgres"
- name = "monica"
- password = "${data.pass_password.monica-db-password.password}"
-}
diff --git a/outline.tf b/outline.tf
index e0451b8..9091af1 100644
--- a/outline.tf
+++ a/outline.tf
@@ -1,10 +1,11 @@
-module "outline" {
- source = "modules/outline"
- smtp_password = "${data.pass_password.outline_smtp_password.password}"
- secret_key = "${data.pass_password.outline_secret_key.password}"
- slack_key = "${data.pass_password.outline_slack_key.password}"
- slack_secret = "${data.pass_password.outline_slack_secret.password}"
- slack_app_id = "${data.pass_password.outline_slack_app_id.password}"
- slack_verification_token = "${data.pass_password.outline_slack_verification_token.password}"
- hostname = "outline.${var.root-domain}"
-}
+# module "outline" {
+# source = "modules/outline"
+# smtp_password = "${data.pass_password.outline_smtp_password.password}"
+# secret_key = "${data.pass_password.outline_secret_key.password}"
+# slack_key = "${data.pass_password.outline_slack_key.password}"
+# slack_secret = "${data.pass_password.outline_slack_secret.password}"
+# slack_app_id = "${data.pass_password.outline_slack_app_id.password}"
+# slack_verification_token = "${data.pass_password.outline_slack_verification_token.password}"
+# hostname = "outline.${var.root-domain}"
+# }
+
diff --git a/pulse.tf b/pulse.tf
index eca1b81..98c17bf 100644
--- a/pulse.tf
+++ a/pulse.tf
@@ -1,28 +1,24 @@
-module "pulse-pshtt" {
- name = "pulse-pshtt"
- source = "modules/container"
- image = "dhsncats/pshtt:0.5.2"
+# module "pulse-pshtt" {
+# name = "pulse-pshtt"
+# source = "modules/container"
+# image = "dhsncats/pshtt:0.5.2"
+# volumes = [
+# {
+# host_path = "/mnt/xwing/data/pulse"
+# container_path = "/home/pshtt"
+# },
+# ]
+# web {
+# expose = false
+# host = ""
+# }
+# command = ["--debug", "--timeout=3", "--cache-third-parties=./cache", "domains.csv"]
+# must_run = "false"
+# restart = "no"
+# # nameserver = "192.168.1.1"
+# networks = ["bridge"]
+# resource = {
+# memory = 2048
+# }
+# }
- volumes = [
- {
- host_path = "/mnt/xwing/data/pulse"
- container_path = "/home/pshtt"
- },
- ]
-
- web {
- expose = false
- host = ""
- }
-
- command = ["--debug", "--timeout=3", "--cache-third-parties=./cache", "domains.csv"]
- must_run = "false"
- restart = "no"
-
- # nameserver = "192.168.1.1"
- networks = ["bridge"]
-
- resource = {
- memory = 2048
- }
-}
diff --git a/requestbin.tf b/requestbin.tf
deleted file mode 100644
index 2aba230..0000000 100644
--- a/requestbin.tf
+++ /dev/null
@@ -1,14 +1,0 @@
-module "requestbin" {
- name = "requestbin"
- source = "./modules/container"
- image = "jankysolutions/requestbin:latest"
-
- // Default is port 80
- web {
- expose = true
- port = "8000"
- host = "requestbin.${var.root-domain}"
- }
-
- networks = "${list(module.docker.traefik-network-id)}"
-}
diff --git a/gitea/data.tf b/gitea/data.tf
index 460f9f9..9e9e6de 100644
--- a/gitea/data.tf
+++ a/gitea/data.tf
@@ -1,7 +1,7 @@
# https://github.com/go-gitea/gitea/releases
data "docker_registry_image" "gitea" {
# not bleeding, this is hemorrhaging edge
- name = "gitea/gitea:1.8"
+ name = "gitea/gitea:1.9"
}
data "docker_registry_image" "redis" {
diff --git a/media/bazarr.tf b/media/bazarr.tf
new file mode 100644
index 0000000..ba1b3a2 100644
--- /dev/null
+++ a/media/bazarr.tf
@@ -1,0 +1,39 @@
+module "bazarr-container" {
+ name = "bazarr"
+ source = "../modules/container"
+ image = "linuxserver/bazarr:latest"
+
+ web {
+ expose = true
+ port = 6767
+ host = "bazarr.${var.domain}"
+ }
+
+ resource {
+ memory = 512
+ memory_swap = 1024
+ }
+
+ volumes = [
+ {
+ host_path = "/mnt/xwing/config/bazarr"
+ container_path = "/config"
+ },
+ {
+ host_path = "/mnt/xwing/media/TV"
+ container_path = "/tv"
+ },
+ {
+ host_path = "/mnt/xwing/media/Movies"
+ container_path = "/movies"
+ },
+ ]
+
+ env = [
+ "PUID=1004",
+ "PGID=1003",
+ "TZ=Asia/Kolkata",
+ ]
+
+ networks = "${list(docker_network.media.id, data.docker_network.bridge.id)}"
+}
diff --git a/media/mylar.tf b/media/mylar.tf
new file mode 100644
index 0000000..7252240 100644
--- /dev/null
+++ a/media/mylar.tf
@@ -1,0 +1,35 @@
+module "mylar" {
+ name = "mylar"
+ source = "../modules/container"
+ image = "linuxserver/mylar:latest"
+
+ web {
+ expose = true
+ port = 8090
+ host = "mylar.${var.domain}"
+ auth = true
+ }
+
+ volumes = [
+ {
+ host_path = "/mnt/xwing/media/EBooks/Comics"
+ container_path = "/comics"
+ },
+ {
+ host_path = "/mnt/xwing/config/mylar"
+ container_path = "/config"
+ },
+ {
+ host_path = "/mnt/xwing/media/DL"
+ container_path = "/downloads"
+ },
+ ]
+
+ env = [
+ "PUID=1004",
+ "PGID=1003",
+ "TZ=Asia/Kolkata",
+ ]
+
+ networks = "${list(docker_network.media.id, data.docker_network.bridge.id)}"
+}
--
rgit 0.1.5