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

author Nemo <me@captnemo.in> 2018-04-19 20:40:52.0 +05:30:00
committer Nemo <me@captnemo.in> 2018-04-19 20:40:52.0 +05:30:00
commit
b05bd3bd8b50769e5a22d8e524369220253c9a74 [patch]
tree
02058d946be02770993996d4c521f11cff8a700b
parent
452c7d5b79b5dfd88916f24f3275f6e353a5e994
download
b05bd3bd8b50769e5a22d8e524369220253c9a74.tar.gz

cleanup, downgrade traefik



Diff

 docker/data.tf           |  2 +-
 docker/images.tf         |  2 +-
 docker/traefik.tf        |  2 +-
 docker/conf/traefik.toml | 45 +++++++++------------------------------------
 4 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/docker/data.tf b/docker/data.tf
index 7e2d53b..9732569 100644
--- a/docker/data.tf
+++ a/docker/data.tf
@@ -11,7 +11,7 @@
data "docker_registry_image" "traefik" {

  # Critical and I like upgrading it
  # for updating config for new features
  name = "traefik:1.6"
  name = "traefik:1.6.0-rc5-alpine"
}

# YOLO everything else
diff --git a/docker/images.tf b/docker/images.tf
index a860242..3739293 100644
--- a/docker/images.tf
+++ a/docker/images.tf
@@ -13,7 +13,7 @@
  pull_triggers = ["${data.docker_registry_image.transmission.sha256_digest}"]
}

resource "docker_image" "traefik" {

resource "docker_image" "traefik16" {

  name          = "${data.docker_registry_image.traefik.name}"
  pull_triggers = ["${data.docker_registry_image.traefik.sha256_digest}"]
}
diff --git a/docker/traefik.tf b/docker/traefik.tf
index c0e676b..00c95e7 100644
--- a/docker/traefik.tf
+++ a/docker/traefik.tf
@@ -1,6 +1,6 @@
resource "docker_container" "traefik" {

  name  = "traefik"
  image = "${docker_image.traefik.latest}"
  image = "${docker_image.traefik16.latest}"

  # Admin Backend
  ports {

diff --git a/docker/conf/traefik.toml b/docker/conf/traefik.toml
index 3f8965d..22d53b4 100644
--- a/docker/conf/traefik.toml
+++ a/docker/conf/traefik.toml
@@ -1,10 +1,13 @@
defaultEntryPoints = ["http", "https"]

# Have to enable this because of heimdall
InsecureSkipVerify = true

sendAnonymousUsage = true
checkNewVersion = false

[traefikLog]
[accessLog]

[entryPoints]
[entryPoints.http]
  address = ":80"
@@ -30,7 +33,7 @@
  endpoint = "unix:///var/run/docker.sock"
  domain = "bb8.fun"
  watch = true
  exposedbydefault = false
  exposedbydefault = true

[file]
[backends]
@@ -74,7 +77,6 @@
[web.metrics.prometheus]

[acme]

email = "acme@captnemo.in"
storage = "/acme/acme.json"
entryPoint = "https"
@@ -89,43 +91,6 @@
  provider = "cloudflare"
  delayBeforeCheck = 30

# This is a legacy certificate
# From when traefik did not support
# wildcard certs
[[acme.domains]]
main = "bb8.fun"
sans = [
  "ads.bb8.fun",
  "airsonic.bb8.fun",
  "apps.bb8.fun",
  "cadvisor.bb8.fun",
  "dns.bb8.fun",
  "emby.bb8.fun",
  "falcon.bb8.fun", # Temporarily used for lidarr
  "ghost.bb8.fun",
  "grafana.bb8.fun", # Unused
  "headphones.bb8.fun",
  "home.bb8.fun",
  "info.bb8.fun",
  "jackett.bb8.fun",
  "library.bb8.fun",
  "luke.bb8.fun",
  "monitoring.bb8.fun",
  # "lidarr.bb8.fun", (TBA)
  "ombi.bb8.fun", # Unused
  "pics.bb8.fun",
  "radarr.bb8.fun",
  "read.bb8.fun",
  "rey.bb8.fun",
  "scan.bb8.fun",
  "sonarr.bb8.fun",
  "tatooine.bb8.fun",
  "tie.bb8.fun",
  "traefik.bb8.fun",
  "transmission.bb8.fun",
  "wifi.bb8.fun",
  "wiki.bb8.fun"
]
# Primary 2 wildcard certs
[[acme.domains]]
  main = "*.bb8.fun"