From 90e3bb7fb28d9517b4038bc11087d761e2a360e2 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Mon, 9 Nov 2020 12:12:04 +0100
Subject: [PATCH] bundles/mautrix-telegram: no need to provide our own
 alembic.ini

---
 bundles/mautrix-telegram/files/alembic.ini | 71 ----------------------
 bundles/mautrix-telegram/items.py          |  2 +-
 2 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 bundles/mautrix-telegram/files/alembic.ini

diff --git a/bundles/mautrix-telegram/files/alembic.ini b/bundles/mautrix-telegram/files/alembic.ini
deleted file mode 100644
index 43d1a9d..0000000
--- a/bundles/mautrix-telegram/files/alembic.ini
+++ /dev/null
@@ -1,71 +0,0 @@
-# A generic, single database configuration.
-
-[alembic]
-# path to migration scripts
-script_location = /opt/mautrix-telegram/src/alembic
-
-# template used to generate migration files
-# file_template = %%(rev)s_%%(slug)s
-
-# timezone to use when rendering the date
-# within the migration file as well as the filename.
-# string value is passed to dateutil.tz.gettz()
-# leave blank for localtime
-# timezone =
-
-# max length of characters to apply to the
-# "slug" field
-#truncate_slug_length = 40
-
-# set to 'true' to run the environment during
-# the 'revision' command, regardless of autogenerate
-# revision_environment = false
-
-# set to 'true' to allow .pyc and .pyo files without
-# a source .py file to be detected as revisions in the
-# versions/ directory
-# sourceless = false
-
-# version location specification; this defaults
-# to alembic/versions.  When using multiple version
-# directories, initial revisions must be specified with --version-path
-# version_locations = %(here)s/bar %(here)s/bat alembic/versions
-
-# the output encoding used when revision files
-# are written from script.py.mako
-# output_encoding = utf-8
-
-# Logging configuration
-[loggers]
-keys = root,sqlalchemy,alembic
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = WARN
-handlers = console
-qualname =
-
-[logger_sqlalchemy]
-level = WARN
-handlers =
-qualname = sqlalchemy.engine
-
-[logger_alembic]
-level = INFO
-handlers =
-qualname = alembic
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
diff --git a/bundles/mautrix-telegram/items.py b/bundles/mautrix-telegram/items.py
index 22ea5e3..462a227 100644
--- a/bundles/mautrix-telegram/items.py
+++ b/bundles/mautrix-telegram/items.py
@@ -14,7 +14,7 @@ actions = {
         'triggered': True,
     },
     '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',
+        'command': 'cd /opt/mautrix-telegram/src && /opt/mautrix-telegram/venv/bin/alembic -x config=/opt/mautrix-telegram/config.yaml upgrade head',
         'needs': {
             'action:mautrix-telegram_install_bridge',
             'postgres_db:mautrix-telegram',