Switches to a single traefik network
- See https://github.com/containous/traefik/issues/3429 - traefik labels are added everywhere now
This commit is contained in:
parent
259aa69f8f
commit
453e976d85
|
@ -14,5 +14,7 @@ locals {
|
||||||
"traefik.frontend.headers.customFrameOptionsValue" = "${var.xfo_allow}"
|
"traefik.frontend.headers.customFrameOptionsValue" = "${var.xfo_allow}"
|
||||||
"traefik.frontend.headers.contentTypeNosniff" = "true"
|
"traefik.frontend.headers.contentTypeNosniff" = "true"
|
||||||
"traefik.frontend.headers.browserXSSFilter" = "true"
|
"traefik.frontend.headers.browserXSSFilter" = "true"
|
||||||
|
|
||||||
|
"traefik.docker.network" = "traefik"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,15 +95,8 @@ resource "docker_container" "traefik" {
|
||||||
|
|
||||||
// `bridge` is auto-connected for now
|
// `bridge` is auto-connected for now
|
||||||
// https://github.com/terraform-providers/terraform-provider-docker/issues/10
|
// 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 = [
|
networks = [
|
||||||
"${docker_network.traefik.id}",
|
"${docker_network.traefik.id}",
|
||||||
"31efc1966139",
|
|
||||||
"f0d3bbcf75dd",
|
|
||||||
"aad198ad4ba8",
|
|
||||||
"021125972c4b",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
env = [
|
env = [
|
||||||
|
|
|
@ -45,6 +45,7 @@ resource "docker_container" "wiki" {
|
||||||
))}"
|
))}"
|
||||||
networks = [
|
networks = [
|
||||||
"${var.networks-mongorocks}",
|
"${var.networks-mongorocks}",
|
||||||
|
"${docker_network.traefik.id}",
|
||||||
]
|
]
|
||||||
env = [
|
env = [
|
||||||
"WIKI_ADMIN_EMAIL=me@captnemo.in",
|
"WIKI_ADMIN_EMAIL=me@captnemo.in",
|
||||||
|
|
2
main.tf
2
main.tf
|
@ -20,8 +20,6 @@ module "docker" {
|
||||||
cloudflare_key = "${var.cloudflare_key}"
|
cloudflare_key = "${var.cloudflare_key}"
|
||||||
cloudflare_email = "bb8@captnemo.in"
|
cloudflare_email = "bb8@captnemo.in"
|
||||||
wiki_session_secret = "${var.wiki_session_secret}"
|
wiki_session_secret = "${var.wiki_session_secret}"
|
||||||
|
|
||||||
# links-mariadb = "${module.db.names-mariadb}"
|
|
||||||
networks-mongorocks = "${module.db.networks-mongorocks}"
|
networks-mongorocks = "${module.db.networks-mongorocks}"
|
||||||
ips = "${var.ips}"
|
ips = "${var.ips}"
|
||||||
domain = "bb8.fun"
|
domain = "bb8.fun"
|
||||||
|
|
|
@ -67,6 +67,9 @@ variable "traefik-common-labels" {
|
||||||
"traefik.frontend.headers.customFrameOptionsValue" = "ALLOW-FROM https://bb8.fun/"
|
"traefik.frontend.headers.customFrameOptionsValue" = "ALLOW-FROM https://bb8.fun/"
|
||||||
"traefik.frontend.headers.contentTypeNosniff" = "true"
|
"traefik.frontend.headers.contentTypeNosniff" = "true"
|
||||||
"traefik.frontend.headers.browserXSSFilter" = "true"
|
"traefik.frontend.headers.browserXSSFilter" = "true"
|
||||||
|
|
||||||
|
// Use the Traefik network
|
||||||
|
"traefik.docker.network" = "traefik"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue