diff --git a/bundles/mautrix-telegram/items.py b/bundles/mautrix-telegram/items.py index b2db9a4..254548e 100644 --- a/bundles/mautrix-telegram/items.py +++ b/bundles/mautrix-telegram/items.py @@ -6,16 +6,6 @@ actions = { 'directory:/opt/mautrix-telegram', # provided by bundle:users }, }, - 'mautrix-telegram_install_bridge': { - # TODO find out how we can check if *this package* requires an update - 'command': '/opt/mautrix-telegram/venv/bin/pip install --upgrade mautrix-telegram[all]', - 'needs': { - 'action:mautrix-telegram_create_virtualenv', - }, - 'triggers': { - 'action:mautrix-telegram_upgrade_database', - }, - }, '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', @@ -34,6 +24,19 @@ actions = { }, } +pkg_pip = { + '/opt/mautrix-telegram/venv/mautrix-telegram': { + 'needs': { + 'action:mautrix-telegram_create_virtualenv', + }, + 'triggers': { + 'action:mautrix-telegram_upgrade_database', + 'svc_systemd:mautrix-telegram:restart', + }, + }, +} + + svc_systemd = { 'mautrix-telegram': { 'needs': { diff --git a/groups/all.py b/groups/all.py index 3e1b76e..f53e9ae 100644 --- a/groups/all.py +++ b/groups/all.py @@ -1,7 +1,7 @@ groups['all'] = { - 'member_patterns': ( + 'member_patterns': { r".*", - ), + }, 'bundles': { 'apt', 'cron', @@ -35,5 +35,6 @@ groups['all'] = { }, }, }, + 'pip_command': 'pip3', } diff --git a/requirements.txt b/requirements.txt index 226cb18..c8edcaf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -bundlewrap>=4.0.0 +bundlewrap>=4.2.0