Merge pull request 'upgrade' (#4) from upgrade into master

Reviewed-on: #4

.gitignore

@@ -1 +1,2 @@
 ansible-navigator.log
+collections/

roles/infra/tasks/git.yml

@@ -29,6 +29,7 @@
       path: "~/.config/systemd/user/"
     label:
       traefik.enable: "true"
+      traefik.http.routers.gitea.entrypoints: "http"
       traefik.http.routers.gitea.rule: "Host(`git.wtf.lt`)"
       traefik.http.middlewares.gitea-https-redirect.redirectscheme.scheme: "https"
       traefik.http.routers.gitea.middlewares: "gitea-https-redirect"

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.http.redirections.entryPoint.to=https --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

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

roles/mastodon/templates/mastodon.container.j2

@@ -5,10 +5,9 @@ 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=mastodon_external.network
 Network=podman
 Environment=LOCAL_DOMAIN=wtf.lt
 Environment=REDIS_HOST=redis

roles/mastodon/templates/sidekiq.container.j2

@@ -5,10 +5,9 @@ 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
-Network=mastodon_external.network
 Environment=LOCAL_DOMAIN=wtf.lt
 Environment=REDIS_HOST=redis
 Environment=REDIS_PORT=6379