minor fixes and upgrades
This commit is contained in:
parent
f6b1954e8f
commit
ba763d585c
|
@ -3,9 +3,9 @@ resource "docker_container" "postgres" {
|
||||||
image = docker_image.postgres.latest
|
image = docker_image.postgres.latest
|
||||||
|
|
||||||
volumes {
|
volumes {
|
||||||
volume_name = docker_volume.postgres_volume.name
|
volume_name = docker_volume.pg_data.name
|
||||||
container_path = "/var/lib/postgresql/data"
|
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
|
// This is so that other host-only services can share this
|
||||||
|
@ -24,6 +24,7 @@ resource "docker_container" "postgres" {
|
||||||
}
|
}
|
||||||
|
|
||||||
memory = 256
|
memory = 256
|
||||||
|
memory_swap = 512
|
||||||
restart = "unless-stopped"
|
restart = "unless-stopped"
|
||||||
destroy_grace_seconds = 10
|
destroy_grace_seconds = 10
|
||||||
must_run = true
|
must_run = true
|
||||||
|
@ -47,4 +48,3 @@ data "docker_registry_image" "postgres" {
|
||||||
data "docker_network" "bridge" {
|
data "docker_network" "bridge" {
|
||||||
name = "bridge"
|
name = "bridge"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,17 +1,8 @@
|
||||||
terraform {
|
terraform {
|
||||||
required_providers {
|
required_providers {
|
||||||
pass = {
|
|
||||||
source = "camptocamp/pass"
|
|
||||||
}
|
|
||||||
digitalocean = {
|
|
||||||
source = "digitalocean/digitalocean"
|
|
||||||
}
|
|
||||||
postgresql = {
|
postgresql = {
|
||||||
source = "cyrilgdn/postgresql"
|
source = "cyrilgdn/postgresql"
|
||||||
}
|
}
|
||||||
cloudflare = {
|
|
||||||
source = "cloudflare/cloudflare"
|
|
||||||
}
|
|
||||||
docker = {
|
docker = {
|
||||||
source = "kreuzwerker/docker"
|
source = "kreuzwerker/docker"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
variable "postgres-version" {
|
variable "postgres-version" {
|
||||||
description = "postgres version to use for fetching the docker image"
|
description = "postgres version to use for fetching the docker image"
|
||||||
default = "10-alpine"
|
default = "14-alpine"
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "ips" {
|
variable "ips" {
|
||||||
|
@ -9,4 +9,3 @@ variable "ips" {
|
||||||
|
|
||||||
variable "postgres-root-password" {
|
variable "postgres-root-password" {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
resource "docker_volume" "postgres_volume" {
|
resource "docker_volume" "pg_data" {
|
||||||
name = "postgres_volume"
|
name = "pg_data"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ acmelogging = true
|
||||||
|
|
||||||
[acme.dnsChallenge]
|
[acme.dnsChallenge]
|
||||||
provider = "cloudflare"
|
provider = "cloudflare"
|
||||||
delayBeforeCheck = 30
|
delayBeforeCheck = 120
|
||||||
|
|
||||||
# Primary 2 wildcard certs
|
# Primary 2 wildcard certs
|
||||||
[[acme.domains]]
|
[[acme.domains]]
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
module "elibsrv" {
|
module "elibsrv" {
|
||||||
name = "./elibsrv"
|
name = "elibsrv"
|
||||||
source = "./modules/container"
|
source = "./modules/container"
|
||||||
image = "captn3m0/elibsrv"
|
image = "captn3m0/elibsrv"
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,7 @@ module "radarr" {
|
||||||
source = "../modules/container"
|
source = "../modules/container"
|
||||||
image = "linuxserver/radarr:latest"
|
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 = {
|
web = {
|
||||||
expose = true
|
expose = true
|
||||||
|
|
|
@ -21,7 +21,6 @@ module "requestrr" {
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
# TODO FIXME
|
networks = [docker_network.media.id, data.docker_network.bridge.id]
|
||||||
# networks = [docker_network.media.id, data.docker_network.bridge.id]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
module "miniflux-container" {
|
module "miniflux-container" {
|
||||||
name = "miniflux"
|
name = "miniflux"
|
||||||
source = "./modules/container"
|
source = "./modules/container"
|
||||||
image = "miniflux/miniflux:2.0.33"
|
image = "miniflux/miniflux:2.0.34"
|
||||||
|
|
||||||
web = {
|
web = {
|
||||||
expose = true
|
expose = true
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
provider "docker" {
|
provider "docker" {
|
||||||
host = "tcp://docker.vpn.bb8.fun:2376"
|
host = "tcp://docker.vpn.bb8.fun:2376"
|
||||||
cert_path = "./secrets/tatooine"
|
cert_path = "./secrets/tatooine"
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
provider "docker" {
|
provider "docker" {
|
||||||
|
|
|
@ -34,6 +34,10 @@ data "pass_password" "miniflux-db-password" {
|
||||||
path = "Nebula/MINIFLUX_DB_PASSWORD"
|
path = "Nebula/MINIFLUX_DB_PASSWORD"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data "pass_password" "firesync-db-password" {
|
||||||
|
path = "Nebula/FIRESYNC_DB_PASSWORD"
|
||||||
|
}
|
||||||
|
|
||||||
data "pass_password" "cloudflare_key" {
|
data "pass_password" "cloudflare_key" {
|
||||||
path = "Nebula/CLOUDFLARE_KEY"
|
path = "Nebula/CLOUDFLARE_KEY"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue