diff --git a/docker/airsonic.tf b/docker/airsonic.tf index c246119..5b9ed33 100644 --- a/docker/airsonic.tf +++ b/docker/airsonic.tf @@ -1,39 +1,32 @@ # resource "docker_container" "airsonic" { # name = "airsonic" # image = "${docker_image.airsonic.latest}" - # restart = "unless-stopped" # destroy_grace_seconds = 30 # must_run = true # memory = 800 - # volumes { # host_path = "/mnt/xwing/config/airsonic/data" # container_path = "/config" # } - # volumes { # host_path = "/mnt/xwing/media/Music" # container_path = "/music" # } - # volumes { # host_path = "/mnt/xwing/config/airsonic/playlists" # container_path = "/playlists" # } - # volumes { # host_path = "/mnt/xwing/config/airsonic/podcasts" # container_path = "/podcasts" # } - # labels { # "traefik.enable" = "true" # "traefik.port" = "4040" # "traefik.frontend.rule" = "Host:airsonic.in.${var.domain},airsonic.${var.domain}" # "traefik.frontend.passHostHeader" = "true" # } - # # lounge:tatooine # env = [ # "PUID=1004", @@ -41,4 +34,5 @@ # "TZ=Asia/Kolkata", # "CONTEXT_PATH=https://airsonic.bb8.fun", # ] -# } \ No newline at end of file +# } + diff --git a/docker/couchpotato.tf b/docker/couchpotato.tf index 0fcc605..f2011c7 100644 --- a/docker/couchpotato.tf +++ b/docker/couchpotato.tf @@ -37,4 +37,4 @@ resource "docker_container" "couchpotato" { ] links = ["{docker_container.transmission.name}"] -} \ No newline at end of file +} diff --git a/docker/debug.tf b/docker/debug.tf index c14bc65..9bdf418 100644 --- a/docker/debug.tf +++ b/docker/debug.tf @@ -15,4 +15,4 @@ resource "docker_container" "headerdebug" { "traefik.port", 8080, "traefik.enable", "true", ))}" -} \ No newline at end of file +} diff --git a/docker/emby.tf b/docker/emby.tf index c3f09e1..0f474f8 100644 --- a/docker/emby.tf +++ b/docker/emby.tf @@ -33,4 +33,4 @@ resource "docker_container" "emby" { "APP_CONFIG=/mnt/xwing/config", "TZ=Asia/Kolkata", ] -} \ No newline at end of file +} diff --git a/docker/headphones.tf b/docker/headphones.tf index bda2c44..281b931 100644 --- a/docker/headphones.tf +++ b/docker/headphones.tf @@ -40,4 +40,4 @@ resource "docker_container" "headphones" { "PGID=1003", "TZ=Asia/Kolkata", ] -} \ No newline at end of file +} diff --git a/docker/lychee.tf b/docker/lychee.tf index 3f5476b..09d2d22 100644 --- a/docker/lychee.tf +++ b/docker/lychee.tf @@ -22,9 +22,10 @@ resource "docker_container" "lychee" { } labels = "${merge( - locals.traefik_common_labels, map( + 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},pics.in.${var.domain}", ))}" env = [ diff --git a/docker/main.tf b/docker/main.tf index e69de29..8b13789 100644 --- a/docker/main.tf +++ b/docker/main.tf @@ -0,0 +1 @@ + diff --git a/docker/wiki.tf b/docker/wiki.tf index 7f54901..d1c0049 100644 --- a/docker/wiki.tf +++ b/docker/wiki.tf @@ -43,9 +43,7 @@ resource "docker_container" "wiki" { "traefik.port", 9999, "traefik.frontend.headers.customResponseHeaders", "${var.xpoweredby}||Referrer-Policy:${var.refpolicy}||X-Frame-Options:${var.xfo_allow}", ))}" - links = ["${docker_container.mongorocks.name}"] - env = [ "WIKI_ADMIN_EMAIL=me@captnemo.in", "SESSION_SECRET=${var.wiki_session_secret}", diff --git a/main.tf b/main.tf index ad566d2..af5318c 100644 --- a/main.tf +++ b/main.tf @@ -14,15 +14,15 @@ module "mysql" { } module "docker" { - source = "docker" - web_username = "${var.web_username}" - web_password = "${var.web_password}" - mysql_root_password = "${var.mysql_root_password}" - cloudflare_key = "${var.cloudflare_key}" - cloudflare_email = "bb8@captnemo.in" - wiki_session_secret = "${var.wiki_session_secret}" - ips = "${var.ips}" - domain = "bb8.fun" + source = "docker" + web_username = "${var.web_username}" + web_password = "${var.web_password}" + mysql_root_password = "${var.mysql_root_password}" + cloudflare_key = "${var.cloudflare_key}" + cloudflare_email = "bb8@captnemo.in" + wiki_session_secret = "${var.wiki_session_secret}" + ips = "${var.ips}" + domain = "bb8.fun" } module "gitea" { @@ -62,7 +62,7 @@ module "monitoring" { gf-security-admin-password = "${var.gf-security-admin-password}" domain = "bb8.fun" transmission = "${module.docker.names-transmission}" - traefik-labels = "${var.traefik-common-labels}" + traefik-labels = "${var.traefik-common-labels}" } module "digitalocean" {