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

cae1467588ef8cfa449acc9db100aac0d67efec8 [patch]

3cd2065f9233abd4ecb0859cee0594e46590221d

85832d4ad0e038c8c9c3c96e0d3fbeeb1fa2eb6a

cae1467588ef8cfa449acc9db100aac0d67efec8.tar.gz

Switches to common labels for tt-rss

Diff

 main.tf             |  1 +
 tt-rss/main.tf      | 16 ++++++++--------
 tt-rss/variables.tf |  4 ++++
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/main.tf b/main.tf
index e4abdc9..cd863e4 100644
--- a/main.tf
+++ a/main.tf
@@ -39,6 +39,7 @@
  domain         = "rss.captnemo.in"
  mysql_password = "${var.mysql-ttrss-password}"
  links-db       = "${module.docker.names-mariadb}"
  traefik-labels = "${var.traefik-common-labels}"
}

module "media" {

diff --git a/tt-rss/main.tf b/tt-rss/main.tf
index 572ad6c..0fc7073 100644
--- a/tt-rss/main.tf
+++ a/tt-rss/main.tf
@@ -11,17 +11,11 @@
  name  = "tt-rss"
  image = "${docker_image.tt-rss.latest}"

  labels {

    "traefik.port"                                  = 80

    "traefik.enable"                                = "true"

    "traefik.frontend.headers.SSLTemporaryRedirect" = "true"

    "traefik.frontend.headers.STSSeconds"           = "2592000"

    "traefik.frontend.headers.STSIncludeSubdomains" = "false"

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

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

    "traefik.frontend.passHostHeader"               = "true"

    "traefik.frontend.rule"                         = "Host:${var.domain}"

  }
  labels = "${merge(

    var.traefik-labels, map(
      "traefik.port", 80,
      "traefik.frontend.rule","Host:${var.domain}"
  ))}"

  volumes {

    host_path      = "/mnt/xwing/config/tt-rss"
diff --git a/tt-rss/variables.tf b/tt-rss/variables.tf
index d7b9562..b053af5 100644
--- a/tt-rss/variables.tf
+++ a/tt-rss/variables.tf
@@ -1,6 +1,10 @@
variable "domain" {

  type = "string"
}

variable "mysql_password" {}
variable "links-db" {}

variable "traefik-labels" {

  type = "map"
}