Bring back traefik dashboard etc and some upgrades
Diff
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(-)
@@ -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"
}
@@ -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"
@@ -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"
@@ -1,6 +1,6 @@
data "docker_registry_image" "gitea" {
name = "gitea/gitea:1.22"
name = "gitea/gitea:1.23"
}
data "docker_registry_image" "redis" {
@@ -32,21 +32,21 @@
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"
}
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 @@
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"
}
@@ -1,5 +1,5 @@
locals {
version = "4.1.18"
version = "4.1.25"
env = [
"LOCAL_DOMAIN=tatooine.club",
"REDIS_HOST=mastodon-redis",
@@ -7,6 +7,9 @@
networks = ["mastodon", "traefik", "external", "postgres"]
dns = [
"192.168.1.111",
"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",
"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",
"45.90.28.120",
"45.90.30.120",
"1.1.1.1"
]
@@ -1,7 +1,10 @@
defaultEntryPoints = ["http", "https"]
sendAnonymousUsage = true
sendAnonymousUsage = false
checkNewVersion = false
[web]
address = ":1111"
readOnly = true
[web.statistics]
[traefikLog]
[accessLog]