From 10cb11c96574d9d34bc9476bc8cd4fa8a3d65c6c Mon Sep 17 00:00:00 2001 From: Simonas Kareiva Date: Thu, 30 Jul 2026 20:41:24 +0300 Subject: [PATCH 1/3] Use default podman network for external purposes --- roles/infra/templates/traefik.container.j2 | 2 +- roles/mastodon/templates/elasticsearch.container.j2 | 1 - roles/mastodon/templates/mastodon.container.j2 | 1 - roles/mastodon/templates/sidekiq.container.j2 | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/roles/infra/templates/traefik.container.j2 b/roles/infra/templates/traefik.container.j2 index f78453f..41012e8 100644 --- a/roles/infra/templates/traefik.container.j2 +++ b/roles/infra/templates/traefik.container.j2 @@ -9,7 +9,7 @@ Restart=always [Container] ContainerName=traefik Image=docker.io/library/traefik:latest -Exec=--api.dashboard=true --api.insecure=true --certificatesresolvers.lets-encrypt.acme.email={{ infra_acme.email }} --certificatesresolvers.lets-encrypt.acme.storage=/{{ infra_acme.storage }} --certificatesresolvers.lets-encrypt.acme.tlschallenge=true --entrypoints.http --entrypoints.http.address=:80 --entrypoints.http.http.redirections.entryPoint.to=:443 --entrypoints.http.http.redirections.entryPoint.scheme=https --entrypoints.https --providers.docker=true +Exec=--api.dashboard=true --api.insecure=true --certificatesresolvers.lets-encrypt.acme.email={{ infra_acme.email }} --certificatesresolvers.lets-encrypt.acme.storage=/{{ infra_acme.storage }} --certificatesresolvers.lets-encrypt.acme.tlschallenge=true --entrypoints.http --entrypoints.http.address=:80 --entrypoints.http.http.redirections.entryPoint.to=:443 --entrypoints.http.http.redirections.entryPoint.scheme=https --entrypoints.https --providers.docker=true --providers.docker.network=podman Network=podman Notify=true PublishPort=8080:8080 diff --git a/roles/mastodon/templates/elasticsearch.container.j2 b/roles/mastodon/templates/elasticsearch.container.j2 index bf824df..3700038 100644 --- a/roles/mastodon/templates/elasticsearch.container.j2 +++ b/roles/mastodon/templates/elasticsearch.container.j2 @@ -5,7 +5,6 @@ Description=Mastodon Elasticsearch ContainerName=elasticsearch Image=docker.elastic.co/elasticsearch/elasticsearch:7.17.29 Network=mastodon_internal.network -Network=mastodon_external.network Environment=ES_JAVA_OPTS=-Xms512m -Xmx512m -Des.enforce.bootstrap.checks=true Environment=xpack.license.self_generated.type=basic Environment=xpack.security.enabled=false diff --git a/roles/mastodon/templates/mastodon.container.j2 b/roles/mastodon/templates/mastodon.container.j2 index 4ab51bd..8afcc8e 100644 --- a/roles/mastodon/templates/mastodon.container.j2 +++ b/roles/mastodon/templates/mastodon.container.j2 @@ -8,7 +8,6 @@ ContainerName=mastodon Image=ghcr.io/mastodon/mastodon:v4.5.5 Exec=bundle exec puma -C config/puma.rb Network=mastodon_internal.network -Network=mastodon_external.network Network=podman Environment=LOCAL_DOMAIN=wtf.lt Environment=REDIS_HOST=redis diff --git a/roles/mastodon/templates/sidekiq.container.j2 b/roles/mastodon/templates/sidekiq.container.j2 index 297140e..4456660 100644 --- a/roles/mastodon/templates/sidekiq.container.j2 +++ b/roles/mastodon/templates/sidekiq.container.j2 @@ -8,7 +8,6 @@ ContainerName=sidekiq Image=ghcr.io/mastodon/mastodon:v4.5.5 Exec=bundle exec sidekiq Network=mastodon_internal.network -Network=mastodon_external.network Environment=LOCAL_DOMAIN=wtf.lt Environment=REDIS_HOST=redis Environment=REDIS_PORT=6379 From 74c826473bc3bdb83d9def5366884cc6074c9fa9 Mon Sep 17 00:00:00 2001 From: Simonas Kareiva Date: Thu, 30 Jul 2026 20:42:02 +0300 Subject: [PATCH 2/3] Upgrade to 4.6.4 --- roles/mastodon/templates/mastodon.container.j2 | 2 +- roles/mastodon/templates/sidekiq.container.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mastodon/templates/mastodon.container.j2 b/roles/mastodon/templates/mastodon.container.j2 index 8afcc8e..2aceb19 100644 --- a/roles/mastodon/templates/mastodon.container.j2 +++ b/roles/mastodon/templates/mastodon.container.j2 @@ -5,7 +5,7 @@ Requires=database.service redis.service elasticsearch.service [Container] ContainerName=mastodon -Image=ghcr.io/mastodon/mastodon:v4.5.5 +Image=ghcr.io/mastodon/mastodon:v4.6.4 Exec=bundle exec puma -C config/puma.rb Network=mastodon_internal.network Network=podman diff --git a/roles/mastodon/templates/sidekiq.container.j2 b/roles/mastodon/templates/sidekiq.container.j2 index 4456660..3657efb 100644 --- a/roles/mastodon/templates/sidekiq.container.j2 +++ b/roles/mastodon/templates/sidekiq.container.j2 @@ -5,7 +5,7 @@ Requires=database.service redis.service elasticsearch.service [Container] ContainerName=sidekiq -Image=ghcr.io/mastodon/mastodon:v4.5.5 +Image=ghcr.io/mastodon/mastodon:v4.6.4 Exec=bundle exec sidekiq Network=mastodon_internal.network Environment=LOCAL_DOMAIN=wtf.lt From 3cdbab4974eec06705b0e7376c6cd33cabf5b9bd Mon Sep 17 00:00:00 2001 From: Simonas Kareiva Date: Thu, 30 Jul 2026 20:42:48 +0300 Subject: [PATCH 3/3] Ignore local collections --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 01a2417..7492514 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ ansible-navigator.log +collections/