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

ba763d585c0c16bb02f498d2808ffa2818356565 [patch]

fee1e3461170ba9a1ff42e7885100bbcc7ec9fcd

f6b1954e8f382c6ddb1792ee805f7ac5fd4b73c2

ba763d585c0c16bb02f498d2808ffa2818356565.tar.gz

minor fixes and upgrades

Diff

 elibsrv.tf               |  2 +-
 miniflux.tf              |  2 +-
 providers.tf             |  2 --
 secrets.tf               |  4 ++++
 db/postgres.tf           |  6 +++---
 db/providers.tf          |  9 ---------
 db/variables.tf          |  3 +--
 db/volumes.tf            |  5 ++---
 media/radarr.tf          |  3 +--
 media/requestrr.tf       |  3 +--
 docker/conf/traefik.toml |  2 +-
 11 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/elibsrv.tf b/elibsrv.tf
index ea771a5..f8c0174 100644
--- a/elibsrv.tf
+++ a/elibsrv.tf
@@ -1,5 +1,5 @@
module "elibsrv" {

  name   = "./elibsrv"
  name   = "elibsrv"
  source = "./modules/container"
  image  = "captn3m0/elibsrv"

diff --git a/miniflux.tf b/miniflux.tf
index a4f74f1..aee8700 100644
--- a/miniflux.tf
+++ a/miniflux.tf
@@ -1,7 +1,7 @@
module "miniflux-container" {

  name   = "miniflux"
  source = "./modules/container"
  image  = "miniflux/miniflux:2.0.33"
  image  = "miniflux/miniflux:2.0.34"

  web = {

    expose = true
diff --git a/providers.tf b/providers.tf
index 160466a..baa3523 100644
--- a/providers.tf
+++ a/providers.tf
@@ -1,8 +1,6 @@
provider "docker" {

  host      = "tcp://docker.vpn.bb8.fun:2376"
  cert_path = "./secrets/tatooine"


}

provider "docker" {

diff --git a/secrets.tf b/secrets.tf
index 7f48b3d..90d0932 100644
--- a/secrets.tf
+++ a/secrets.tf
@@ -34,6 +34,10 @@
  path = "Nebula/MINIFLUX_DB_PASSWORD"
}

data "pass_password" "firesync-db-password" {

  path = "Nebula/FIRESYNC_DB_PASSWORD"
}

data "pass_password" "cloudflare_key" {

  path = "Nebula/CLOUDFLARE_KEY"
}
diff --git a/db/postgres.tf b/db/postgres.tf
index 95ec82b..cee09e2 100644
--- a/db/postgres.tf
+++ a/db/postgres.tf
@@ -1,11 +1,11 @@
resource "docker_container" "postgres" {

  name  = "postgres"
  image = docker_image.postgres.latest

  volumes {

    volume_name    = docker_volume.postgres_volume.name
    volume_name    = docker_volume.pg_data.name
    container_path = "/var/lib/postgresql/data"
    host_path      = docker_volume.postgres_volume.mountpoint
    read_only      = false
  }

  // This is so that other host-only services can share this
@@ -24,6 +24,7 @@
  }

  memory                = 256
  memory_swap           = 512
  restart               = "unless-stopped"
  destroy_grace_seconds = 10
  must_run              = true
@@ -47,4 +48,3 @@
data "docker_network" "bridge" {

  name = "bridge"
}

diff --git a/db/providers.tf b/db/providers.tf
index c8dd4a4..b924f6c 100644
--- a/db/providers.tf
+++ a/db/providers.tf
@@ -1,16 +1,7 @@
terraform {

  required_providers {

    pass = {

      source = "camptocamp/pass"
    }
    digitalocean = {

      source = "digitalocean/digitalocean"
    }
    postgresql = {

      source = "cyrilgdn/postgresql"
    }
    cloudflare = {

      source = "cloudflare/cloudflare"
    }
    docker = {

      source = "kreuzwerker/docker"
diff --git a/db/variables.tf b/db/variables.tf
index d6424da..5af5116 100644
--- a/db/variables.tf
+++ a/db/variables.tf
@@ -1,6 +1,6 @@
variable "postgres-version" {

  description = "postgres version to use for fetching the docker image"
  default     = "10-alpine"
  default     = "14-alpine"
}

variable "ips" {

@@ -9,4 +9,3 @@

variable "postgres-root-password" {

}

diff --git a/db/volumes.tf b/db/volumes.tf
index b27958c..f592687 100644
--- a/db/volumes.tf
+++ a/db/volumes.tf
@@ -1,4 +1,3 @@
resource "docker_volume" "postgres_volume" {

  name = "postgres_volume"
resource "docker_volume" "pg_data" {

  name = "pg_data"
}

diff --git a/media/radarr.tf b/media/radarr.tf
index 9ebffab..128f218 100644
--- a/media/radarr.tf
+++ a/media/radarr.tf
@@ -1,10 +1,9 @@
module "radarr" {

  name   = "radarr"
  source = "../modules/container"
  image  = "linuxserver/radarr:latest"

  # TODO FIXME
  # networks = [docker_network.media.id, data.docker_network.bridge.id]
  networks = [docker_network.media.id, data.docker_network.bridge.id]

  web = {

    expose = true
diff --git a/media/requestrr.tf b/media/requestrr.tf
index 0a3baf1..ad60e8e 100644
--- a/media/requestrr.tf
+++ a/media/requestrr.tf
@@ -21,7 +21,6 @@
    },
  ]

  # TODO FIXME
  # networks = [docker_network.media.id, data.docker_network.bridge.id]
  networks = [docker_network.media.id, data.docker_network.bridge.id]
}

diff --git a/docker/conf/traefik.toml b/docker/conf/traefik.toml
index e5f2a69..8eaf04c 100644
--- a/docker/conf/traefik.toml
+++ a/docker/conf/traefik.toml
@@ -58,7 +58,7 @@

[acme.dnsChallenge]
  provider = "cloudflare"
  delayBeforeCheck = 30
  delayBeforeCheck = 120

# Primary 2 wildcard certs
[[acme.domains]]