More work on networks instead of links
Diff
main.tf | 4 ++--
db/mariadb.tf | 2 ++
db/mongorocks.tf | 2 ++
db/network.tf | 19 +++++++++++++++++++
db/outputs.tf | 4 ++--
docker/variables.tf | 2 +-
docker/wiki.tf | 4 +++-
7 files changed, 31 insertions(+), 6 deletions(-)
@@ -21,7 +21,7 @@
cloudflare_email = "bb8@captnemo.in"
wiki_session_secret = "${var.wiki_session_secret}"
links-mariadb = "${module.db.names-mariadb}"
links-mongorocks = "${module.db.names-mongorocks}"
networks-mongorocks = "${module.db.networks-mongorocks}"
ips = "${var.ips}"
domain = "bb8.fun"
}
@@ -95,7 +95,7 @@
links-emby = "${module.media.names-emby}"
links-transmission = "${module.media.names-transmission}"
links-mariadb = "${module.db.names-mariadb}"
links-mongorocks = "${module.db.names-mongorocks}"
links-mongorocks = "${module.db.networks-mongorocks}"
traefik-labels = "${var.traefik-common-labels}"
airsonic-smtp-password = "${var.airsonic-smtp-password}"
airsonic-db-password = "${var.mysql_airsonic_password}"
@@ -35,6 +35,8 @@
command = [
"--version=${var.mariadb-version}-MariaDB",
]
networks = ["${docker_network.mariadb.id}"]
}
resource "docker_image" "mariadb" {
@@ -19,6 +19,8 @@
"--rest",
"--master",
]
networks = ["${docker_network.mongorocks.id}"]
}
resource "docker_image" "percona-mongodb-server" {
@@ -1,0 +1,19 @@
resource "docker_network" "mariadb" {
name = "mariadb"
driver = "bridge"
ipam_config {
subnet = "172.19.0.0/28"
gateway = "172.19.0.1"
}
}
resource "docker_network" "mongorocks" {
name = "mongorocks"
driver = "bridge"
ipam_config {
subnet = "172.20.0.0/29"
gateway = "172.20.0.1"
}
}
@@ -1,7 +1,7 @@
output "names-mariadb" {
value = "${docker_container.mariadb.name}"
}
output "names-mongorocks" {
value = "${docker_container.mongorocks.name}"
output "networks-mongorocks" {
value = "${docker_network.mongorocks.name}"
}
@@ -52,4 +52,4 @@
variable "links-mariadb" {}
variable "links-mongorocks" {}
variable "networks-mongorocks" {}
@@ -43,7 +43,9 @@
"traefik.port", 9999,
"traefik.frontend.headers.customResponseHeaders", "${var.xpoweredby}||Referrer-Policy:${var.refpolicy}||X-Frame-Options:${var.xfo_allow}",
))}"
links = ["${var.links-mongorocks}"]
networks = [
"${var.networks-mongorocks}",
]
env = [
"WIKI_ADMIN_EMAIL=me@captnemo.in",
"SESSION_SECRET=${var.wiki_session_secret}",