diff --git a/bundles/mautrix-telegram/files/alembic.ini b/bundles/mautrix-telegram/files/alembic.ini index 52ee476..43d1a9d 100644 --- a/bundles/mautrix-telegram/files/alembic.ini +++ b/bundles/mautrix-telegram/files/alembic.ini @@ -2,7 +2,7 @@ [alembic] # path to migration scripts -script_location = /opt/mautrix-telegram/alembic +script_location = /opt/mautrix-telegram/src/alembic # template used to generate migration files # file_template = %%(rev)s_%%(slug)s diff --git a/bundles/mautrix-telegram/items.py b/bundles/mautrix-telegram/items.py index 9b895f6..22ea5e3 100644 --- a/bundles/mautrix-telegram/items.py +++ b/bundles/mautrix-telegram/items.py @@ -6,14 +6,6 @@ actions = { 'directory:/opt/mautrix-telegram', # provided by bundle:users }, }, - 'mautrix-telegram_init_alembic': { - 'command': '/opt/mautrix-telegram/venv/bin/alembic -c /opt/mautrix-telegram/alembic.ini -x /opt/mautrix-telegram/config.yaml init /opt/mautrix-telegram/alembic', - 'unless': 'test -d /opt/mautrix-telegram/alembic', - 'needs': { - 'action:mautrix-telegram_create_virtualenv', - 'file:/opt/mautrix-telegram/alembic.ini', - }, - }, 'mautrix-telegram_install_bridge': { 'command': 'cd /opt/mautrix-telegram/src && /opt/mautrix-telegram/venv/bin/pip install --upgrade .[all]', 'needs': { @@ -24,8 +16,7 @@ actions = { 'mautrix-telegram_upgrade_database': { 'command': '/opt/mautrix-telegram/venv/bin/alembic -c /opt/mautrix-telegram/alembic.ini -x config=/opt/mautrix-telegram/config.yaml upgrade head', 'needs': { - 'action:mautrix-telegram_create_virtualenv', - 'action:mautrix-telegram_init_alembic', + 'action:mautrix-telegram_install_bridge', 'postgres_db:mautrix-telegram', 'postgres_role:mautrix-telegram', },