diff --git a/roles/web-app-mastodon/meta/volumes.yml b/roles/web-app-mastodon/meta/volumes.yml index 911eca14db..5d54df25ce 100644 --- a/roles/web-app-mastodon/meta/volumes.yml +++ b/roles/web-app-mastodon/meta/volumes.yml @@ -9,8 +9,9 @@ data: target: /mastodon/public/system force_ssl_override: - type: bind + type: config source: "{{ [lookup('container', 'web-app-mastodon', 'directories.instance'), 'overrides', 'zzz_disable_force_ssl.rb'] | path_join }}" + mode: "0444" mounts: - service: mastodon target: /opt/mastodon/config/initializers/zzz_disable_force_ssl.rb diff --git a/roles/web-app-mastodon/templates/compose.yml.j2 b/roles/web-app-mastodon/templates/compose.yml.j2 index 393b62d5b4..d7dbc899fc 100644 --- a/roles/web-app-mastodon/templates/compose.yml.j2 +++ b/roles/web-app-mastodon/templates/compose.yml.j2 @@ -34,7 +34,7 @@ {{ mastodon_service(MASTODON_SERVICE_NAME, MASTODON_CONTAINER, 'mastodon', 'bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"', ports_key='http', with_volumes=true) }} {{ mastodon_service(MASTODON_STREAMING_SERVICE_NAME, MASTODON_STREAMING_CONTAINER, 'streaming', 'node ./streaming', ports_key='websocket') }} {{ mastodon_service(MASTODON_SIDEKIQ_SERVICE_NAME, MASTODON_SIDEKIQ_CONTAINER, 'mastodon', 'bundle exec sidekiq', with_volumes=true) }} -{{ mastodon_service(MASTODON_MIGRATE_SERVICE_NAME, MASTODON_MIGRATE_CONTAINER, 'mastodon', 'bundle exec rails db:prepare', healthcheck=false, after_migrate=false, restart='on-failure') }} +{{ mastodon_service(MASTODON_MIGRATE_SERVICE_NAME, MASTODON_MIGRATE_CONTAINER, 'mastodon', 'bundle exec rails db:prepare', healthcheck=false, after_migrate=false, restart='on-failure', with_volumes=true) }} {{ lookup('compose_volumes', application_id) }} {{ lookup('compose_networks') }}