From 70bb2ec9bc17baaa3d99909cf740a7f088577ec6 Mon Sep 17 00:00:00 2001 From: Nemo Date: Wed, 28 Feb 2018 01:22:44 +0530 Subject: [PATCH] Remove muximux - restricts internal domains to just emby and airsonic --- README.md | 1 - docker/data.tf | 4 ---- docker/debug.tf | 30 +++++++++++++++--------------- docker/images.tf | 5 ----- docker/lychee.tf | 2 +- docker/muximux.tf | 31 ------------------------------- 6 files changed, 16 insertions(+), 57 deletions(-) delete mode 100644 docker/muximux.tf diff --git a/README.md b/README.md index 640549e..816f7b0 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,6 @@ Currently running the following (all links are to the `store.docker.com` links f ## Misc - [Wiki.JS](https://store.docker.com/community/images/requarks/wiki) as a simple home-wiki -- [Muximux](https://store.docker.com/community/images/linuxserver/muximux) as a landing page for the entire setup - [Radicale](https://store.docker.com/community/images/tomsquest/docker-radicale), for a CalDav/Carddav server - [Gitea](https://store.docker.com/community/images/gitea/gitea), git server diff --git a/docker/data.tf b/docker/data.tf index 2e27ee8..a07a715 100644 --- a/docker/data.tf +++ b/docker/data.tf @@ -28,10 +28,6 @@ data "docker_registry_image" "headphones" { name = "linuxserver/headphones:latest" } -data "docker_registry_image" "muximux" { - name = "linuxserver/muximux:latest" -} - data "docker_registry_image" "ubooquity" { name = "linuxserver/ubooquity:latest" } diff --git a/docker/debug.tf b/docker/debug.tf index 9bdf418..3ecf366 100644 --- a/docker/debug.tf +++ b/docker/debug.tf @@ -1,18 +1,18 @@ -resource "docker_container" "headerdebug" { - name = "headerdebug" - image = "${docker_image.headerdebug.latest}" +# resource "docker_container" "headerdebug" { +# name = "headerdebug" +# image = "${docker_image.headerdebug.latest}" - restart = "unless-stopped" - destroy_grace_seconds = 30 - must_run = true +# restart = "unless-stopped" +# destroy_grace_seconds = 30 +# must_run = true - memory = 16 +# memory = 16 - labels = "${merge( - local.traefik_common_labels, - map( - "traefik.frontend.rule", "Host:debug.in.${var.domain},debug.${var.domain}", - "traefik.port", 8080, - "traefik.enable", "true", - ))}" -} +# labels = "${merge( +# local.traefik_common_labels, +# map( +# "traefik.frontend.rule", "Host:debug.in.${var.domain},debug.${var.domain}", +# "traefik.port", 8080, +# "traefik.enable", "true", +# ))}" +# } diff --git a/docker/images.tf b/docker/images.tf index 9c7a260..6f7bfb9 100644 --- a/docker/images.tf +++ b/docker/images.tf @@ -36,11 +36,6 @@ resource "docker_image" "headphones" { pull_triggers = ["${data.docker_registry_image.headphones.sha256_digest}"] } -resource "docker_image" "muximux" { - name = "${data.docker_registry_image.muximux.name}" - pull_triggers = ["${data.docker_registry_image.muximux.sha256_digest}"] -} - resource "docker_image" "ubooquity" { name = "${data.docker_registry_image.ubooquity.name}" pull_triggers = ["${data.docker_registry_image.ubooquity.sha256_digest}"] diff --git a/docker/lychee.tf b/docker/lychee.tf index 09d2d22..2a6fe07 100644 --- a/docker/lychee.tf +++ b/docker/lychee.tf @@ -25,7 +25,7 @@ resource "docker_container" "lychee" { local.traefik_common_labels, map( "traefik.port", 80, - "traefik.frontend.rule", "Host:pics.${var.domain},pics.in.${var.domain}", + "traefik.frontend.rule", "Host:pics.${var.domain}", ))}" env = [ diff --git a/docker/muximux.tf b/docker/muximux.tf deleted file mode 100644 index 8a7b5bb..0000000 --- a/docker/muximux.tf +++ /dev/null @@ -1,31 +0,0 @@ -resource "docker_container" "muximux" { - name = "muximux" - image = "${docker_image.muximux.latest}" - memory = 64 - - restart = "unless-stopped" - destroy_grace_seconds = 10 - must_run = true - - volumes { - host_path = "/mnt/xwing/config/muximux" - container_path = "/config" - } - - labels = "${merge( - local.traefik_common_labels, - map( - "traefik.port", 80, - "traefik.frontend.headers.frameDeny", "true", - "traefik.frontend.passHostHeader", "false", - "traefik.frontend.auth.basic", "${var.basic_auth}", - "traefik.frontend.rule", "Host:home.in.${var.domain},home.${var.domain}", - ))}" - - # lounge:tatooine - env = [ - "PUID=1004", - "PGID=1003", - "TZ=Asia/Kolkata", - ] -}