🏡 index : github.com/captn3m0/nebula.git

453e976d85d380e1ecf68aaef07a3c9c7e3c0af5 [patch]

eb24846b815a6f1ddef9523a9cef04cdd32c994d

259aa69f8ff0add72cfa7c0403e1b49acc315139

453e976d85d380e1ecf68aaef07a3c9c7e3c0af5.tar.gz

Switches to a single traefik network

- See https://github.com/containous/traefik/issues/3429
- traefik labels are added everywhere now

Diff

 main.tf           | 2 --
 variables.tf      | 3 +++
 docker/locals.tf  | 2 ++
 docker/traefik.tf | 7 -------
 docker/wiki.tf    | 1 +
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/main.tf b/main.tf
index 508d063..97f1f1f 100644
--- a/main.tf
+++ a/main.tf
@@ -20,8 +20,6 @@
  cloudflare_key      = "${var.cloudflare_key}"
  cloudflare_email    = "bb8@captnemo.in"
  wiki_session_secret = "${var.wiki_session_secret}"

  # links-mariadb       = "${module.db.names-mariadb}"
  networks-mongorocks = "${module.db.networks-mongorocks}"
  ips                 = "${var.ips}"
  domain              = "bb8.fun"
diff --git a/variables.tf b/variables.tf
index e124c0e..d8156f7 100644
--- a/variables.tf
+++ a/variables.tf
@@ -67,6 +67,9 @@
    "traefik.frontend.headers.customFrameOptionsValue" = "ALLOW-FROM https://bb8.fun/"

    "traefik.frontend.headers.contentTypeNosniff"      = "true"

    "traefik.frontend.headers.browserXSSFilter"        = "true"


    // Use the Traefik network
    "traefik.docker.network" = "traefik"

  }
}

diff --git a/docker/locals.tf b/docker/locals.tf
index d13bffc..fcdafc3 100644
--- a/docker/locals.tf
+++ a/docker/locals.tf
@@ -14,5 +14,7 @@
    "traefik.frontend.headers.customFrameOptionsValue" = "${var.xfo_allow}"

    "traefik.frontend.headers.contentTypeNosniff"      = "true"

    "traefik.frontend.headers.browserXSSFilter"        = "true"


    "traefik.docker.network" = "traefik"

  }
}
diff --git a/docker/traefik.tf b/docker/traefik.tf
index 918c4fb..bab8e33 100644
--- a/docker/traefik.tf
+++ a/docker/traefik.tf
@@ -95,15 +95,8 @@

  // `bridge` is auto-connected for now
  // https://github.com/terraform-providers/terraform-provider-docker/issues/10
  //
  // The extra IDs are till https://github.com/containous/traefik/issues/3429 is resolved
  // gitea, media, opml, monitoring
  networks = [

    "${docker_network.traefik.id}",
    "31efc1966139",
    "f0d3bbcf75dd",
    "aad198ad4ba8",
    "021125972c4b",
  ]

  env = [

diff --git a/docker/wiki.tf b/docker/wiki.tf
index 503bbee..bbfe43e 100644
--- a/docker/wiki.tf
+++ a/docker/wiki.tf
@@ -45,6 +45,7 @@
    ))}"
  networks = [

    "${var.networks-mongorocks}",
    "${docker_network.traefik.id}",
  ]
  env = [

    "WIKI_ADMIN_EMAIL=me@captnemo.in",