From 6691f4b45af319492224de3f8e73d958e78e941c Mon Sep 17 00:00:00 2001
From: Nemo <commits@captnemo.in>
Date: Mon, 08 Jan 2024 11:30:49 +0530
Subject: [PATCH] DNS and certificate fixes
---
miniflux.tf | 2 +-
rss-bridge.tf | 4 ++++
docker/traefik.tf | 12 +++++++-----
mastodon/main.tf | 12 ++++++++++++
media/emby.tf | 2 +-
modules/container/main.tf | 1 +
modules/container/vars.tf | 5 +++++
7 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/miniflux.tf b/miniflux.tf
index 327fa3b..8c5367b 100644
--- a/miniflux.tf
+++ a/miniflux.tf
@@ -1,7 +1,7 @@
module "miniflux-container" {
name = "miniflux"
source = "./modules/container"
- image = "miniflux/miniflux:2.0.50"
+ image = "miniflux/miniflux:2.0.51"
web = {
expose = true
diff --git a/rss-bridge.tf b/rss-bridge.tf
index 0d36535..eca1e18 100644
--- a/rss-bridge.tf
+++ a/rss-bridge.tf
@@ -1,8 +1,12 @@
module "rss-bridge" {
name = "rss-bridge"
source = "./modules/container"
image = "ghcr.io/rss-bridge/rss-bridge:latest"
+ dns = [
+ "192.168.1.111",
+ "1.1.1.1"
+ ]
resource = {
memory = 256
diff --git a/docker/traefik.tf b/docker/traefik.tf
index fe21b90..116e1f8 100644
--- a/docker/traefik.tf
+++ a/docker/traefik.tf
@@ -56,7 +56,6 @@
)
file = "/etc/traefik/git.captnemo.in.crt"
}
-
upload {
content = file(
"/home/nemo/projects/personal/certs/git.captnemo.in/privkey.pem",
@@ -66,17 +65,18 @@
upload {
content = file(
- "/home/nemo/projects/personal/certs/lego/certificates/tatooine.club.key",
+ "/home/nemo/projects/personal/certs/tatooine.club/fullchain.pem",
)
- file = "/etc/traefik/tatooine.club.key"
+ file = "/etc/traefik/tatooine.club.crt"
}
-
upload {
content = file(
- "/home/nemo/projects/personal/certs/lego/certificates/tatooine.club.crt",
+ "/home/nemo/projects/personal/certs/tatooine.club/privkey.pem",
)
- file = "/etc/traefik/tatooine.club.crt"
+ file = "/etc/traefik/tatooine.club.key"
}
+
+
upload {
content = file(
diff --git a/mastodon/main.tf b/mastodon/main.tf
index b4e6e82..e2ee084 100644
--- a/mastodon/main.tf
+++ a/mastodon/main.tf
@@ -5,6 +5,10 @@
keep_image = true
networks = ["mastodon", "traefik", "external", "postgres"]
+ dns = [
+ "192.168.1.111",
+ "1.1.1.1"
+ ]
labels = {
"traefik.frontend.headers.STSPreload" = "true"
@@ -54,6 +58,10 @@
])
networks = ["postgres", "external", "mastodon"]
+ dns = [
+ "192.168.1.111",
+ "1.1.1.1"
+ ]
command = [
"node",
@@ -84,6 +92,10 @@
}
networks = ["postgres", "external", "mastodon"]
+ dns = [
+ "192.168.1.111",
+ "1.1.1.1"
+ ]
command = [
"bundle",
diff --git a/media/emby.tf b/media/emby.tf
index 0551eb2..45ac281 100644
--- a/media/emby.tf
+++ a/media/emby.tf
@@ -53,7 +53,7 @@
# This breaks every time we upgrade the kernel
# or the nvidia driver, and needs a reboot.
- gpus = "all"
+ # gpus = "all"
# Running as lounge:tatooine
env = [
diff --git a/modules/container/main.tf b/modules/container/main.tf
index 4d604e3..f4a7ed7 100644
--- a/modules/container/main.tf
+++ a/modules/container/main.tf
@@ -16,6 +16,7 @@
command = var.command
entrypoint = var.entrypoint
user = var.user
+ dns = var.dns
privileged = var.privileged
diff --git a/modules/container/vars.tf b/modules/container/vars.tf
index 5e7ee0b..534a52a 100644
--- a/modules/container/vars.tf
+++ a/modules/container/vars.tf
@@ -146,3 +146,8 @@
type = bool
default = false
}
+
+variable "dns" {
+ description = "set of dns servers"
+ default = []
+}
--
rgit 0.1.5