From b0b87b42a918ac684c1df2c9049238f8ec67d860 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Wed, 13 Sep 2023 08:35:45 +1000 Subject: [PATCH] maubot: prepare for prod creation Signed-off-by: Ryan Lerch --- roles/openshift-apps/maubot/templates/buildconfig.yml | 2 +- roles/openshift-apps/maubot/templates/config.yml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/openshift-apps/maubot/templates/buildconfig.yml b/roles/openshift-apps/maubot/templates/buildconfig.yml index 05a9d3f91f..ff370d6cad 100644 --- a/roles/openshift-apps/maubot/templates/buildconfig.yml +++ b/roles/openshift-apps/maubot/templates/buildconfig.yml @@ -12,7 +12,7 @@ spec: source: dockerfile: |- FROM fedora:38 - RUN dnf -y install python3-pip fasjson-client python3-jinja2 fedora-messaging && dnf -y clean all + RUN dnf -y install python3-pip fasjson-client python3-jinja2 fedora-messaging python3-httpx && dnf -y clean all RUN pip install maubot[encryption] python-slugify WORKDIR /maubot ENV KRB5_CONFIG=/etc/ipa/krb5.conf diff --git a/roles/openshift-apps/maubot/templates/config.yml b/roles/openshift-apps/maubot/templates/config.yml index 38d70bf082..585cc84de9 100644 --- a/roles/openshift-apps/maubot/templates/config.yml +++ b/roles/openshift-apps/maubot/templates/config.yml @@ -14,7 +14,6 @@ plugin_directories: trash: delete plugin_databases: - #sqlite: /maubot/plugins postgres: default postgres_max_conns_per_plugin: 3 postgres_opts: {} @@ -35,7 +34,11 @@ homeservers: admins: root: "" +{% if env == 'staging' %} {{ maubot_stg_admin_user }}: "{{ maubot_stg_admin_password }}" +{% else %} + {{ maubot_prod_admin_user }}: "{{ maubot_prod_admin_password }}" +{% endif %} api_features: login: true