From 4e112cb45895938d95d65fffe30c57b2960b8974 Mon Sep 17 00:00:00 2001
From: Nemo <commits@captnemo.in>
Date: Sun, 20 Apr 2025 09:56:16 +0530
Subject: [PATCH] Bring back traefik dashboard etc and some upgrades
---
main.tf | 2 +-
db/postgres.tf | 2 ++
docker/traefik.tf | 6 ++++++
gitea/data.tf | 2 +-
gitea/main.tf | 18 ++++++++++++++++--
mastodon/locals.tf | 2 +-
mastodon/main.tf | 10 ++++++++++
docker/conf/traefik.toml | 7 +++++--
8 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/main.tf b/main.tf
index ac262f9..c5ca9f7 100644
--- a/main.tf
+++ a/main.tf
@@ -108,7 +108,7 @@
module "gh-runner-blr-today" {
source = "./modules/gh-runner"
name = "blr-today"
- runner_version = "2.319.0"
+ runner_version = "2.323.0"
token = "${data.pass_password.github-actions-runner-token-blr-today.password}"
url = "https://github.com/blr-today"
}
diff --git a/db/postgres.tf b/db/postgres.tf
index f482084..bbf8e23 100644
--- a/db/postgres.tf
+++ a/db/postgres.tf
@@ -10,6 +10,7 @@
"shared_buffers=500MB",
]
+
volumes {
volume_name = docker_volume.pg_data.name
container_path = "/var/lib/postgresql/data"
@@ -23,6 +24,7 @@
ip = var.ips["eth0"]
}
+ remove_volumes = false
memory = 2048
memory_swap = 2048
restart = "unless-stopped"
diff --git a/docker/traefik.tf b/docker/traefik.tf
index badc319..c7acfde 100644
--- a/docker/traefik.tf
+++ a/docker/traefik.tf
@@ -29,6 +29,12 @@
ip = var.ips["ts"]
}
+ ports {
+ internal = 1111
+ external = 1111
+ ip = var.ips["eth0"]
+ }
+
upload {
content = file("${path.module}/conf/traefik.toml")
file = "/etc/traefik/traefik.toml"
diff --git a/gitea/data.tf b/gitea/data.tf
index cb83a1a..82a5d2a 100644
--- a/gitea/data.tf
+++ a/gitea/data.tf
@@ -1,6 +1,6 @@
# https://github.com/go-gitea/gitea/releases
data "docker_registry_image" "gitea" {
- name = "gitea/gitea:1.22"
+ name = "gitea/gitea:1.23"
}
data "docker_registry_image" "redis" {
diff --git a/gitea/main.tf b/gitea/main.tf
index d896ba8..ab35779 100644
--- a/gitea/main.tf
+++ a/gitea/main.tf
@@ -32,21 +32,21 @@
# PNG images
upload {
content_base64 = filebase64("${path.module}/conf/public/img/gitea-lg.png")
- file = "/data/gitea/public/assets/img/logo.png"
+ file = "/data/gitea/custom/public/assets/img/logo.png"
}
upload {
content_base64 = filebase64("${path.module}/conf/public/img/gitea-lg.png")
- file = "/data/gitea/public/assets/img/apple-touch-icon.png"
+ file = "/data/gitea/custom/public/assets/img/apple-touch-icon.png"
}
upload {
content_base64 = filebase64("${path.module}/conf/public/img/gitea-sm.png")
- file = "/data/gitea/public/assets/img/favicon.png"
+ file = "/data/gitea/custom/public/assets/img/favicon.png"
}
# SVG images
upload {
content_base64 = filebase64("${path.module}/conf/public/img/favicon.svg")
- file = "/data/gitea/public/assets/img/logo.svg"
+ file = "/data/gitea/custom/public/assets/img/logo.svg"
}
upload {
content_base64 = filebase64("${path.module}/conf/public/img/favicon.svg")
@@ -56,11 +56,17 @@
# Some files at top-level
upload {
content = file("${path.module}/conf/public/humans.txt")
- file = "/data/gitea/public/humans.txt"
+ file = "/data/gitea/custom/public/.well-known/humans.txt"
}
+
+ upload {
+ content = file("${path.module}/conf/public/security.txt")
+ file = "/data/gitea/custom/public/.well-known/security.txt"
+ }
+
upload {
content = file("${path.module}/conf/public/robots.txt")
- file = "/data/gitea/public/robots.txt"
+ file = "/data/gitea/custom/public/robots.txt"
}
# Extra Links in header
diff --git a/mastodon/locals.tf b/mastodon/locals.tf
index 4f7fcc9..0cc6dbc 100644
--- a/mastodon/locals.tf
+++ a/mastodon/locals.tf
@@ -1,5 +1,5 @@
locals {
- version = "4.1.18"
+ version = "4.1.25"
env = [
"LOCAL_DOMAIN=tatooine.club",
"REDIS_HOST=mastodon-redis",
diff --git a/mastodon/main.tf b/mastodon/main.tf
index e2ee084..8c539ed 100644
--- a/mastodon/main.tf
+++ a/mastodon/main.tf
@@ -7,6 +7,9 @@
networks = ["mastodon", "traefik", "external", "postgres"]
dns = [
"192.168.1.111",
+ # NextDNS
+ "45.90.28.120",
+ "45.90.30.120",
"1.1.1.1"
]
@@ -60,9 +63,11 @@
networks = ["postgres", "external", "mastodon"]
dns = [
"192.168.1.111",
+ # NextDNS
+ "45.90.28.120",
+ "45.90.30.120",
"1.1.1.1"
]
-
command = [
"node",
"./streaming"
@@ -94,6 +99,9 @@
networks = ["postgres", "external", "mastodon"]
dns = [
"192.168.1.111",
+ # NextDNS
+ "45.90.28.120",
+ "45.90.30.120",
"1.1.1.1"
]
diff --git a/docker/conf/traefik.toml b/docker/conf/traefik.toml
index 5608048..6a71960 100644
--- a/docker/conf/traefik.toml
+++ a/docker/conf/traefik.toml
@@ -1,7 +1,10 @@
defaultEntryPoints = ["http", "https"]
-sendAnonymousUsage = true
+sendAnonymousUsage = false
checkNewVersion = false
-
+[web]
+address = ":1111"
+readOnly = true
+[web.statistics]
[traefikLog]
[accessLog]
--
rgit 0.1.5