finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable setting database URI and other things

Browse Source
This commit is contained in:
Stuart Mumford 2022-06-29 13:17:03 +00:00
parent 6cc92854df
commit 320978cdf5
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/matrix-bot-maubot/defaults/main.yml
View File

@ -17,11 +17,9 @@ matrix_bot_maubot_bot_server_public: "https://{{ matrix_server_fqn_matrix }}"
matrix_bot_maubot_proxy_management_interface: false matrix_bot_maubot_proxy_management_interface: false
matrix_bot_maubot_expose_management_interface: true matrix_bot_maubot_expose_management_interface: true
matrix_bot_database_uri: 'sqlite:///data/maubot.db'
matrix_bot_maubot_secret: '' matrix_bot_maubot_port: 29316
matrix_bot_maubot_admin_user: '' matrix_bot_maubot_secret: 'generate'
matrix_bot_maubot_admin_password: ''
matrix_mau_environment_variables_extension: ''
# A list of extra arguments to pass to the container # A list of extra arguments to pass to the container
matrix_bot_maubot_container_extra_arguments: [] matrix_bot_maubot_container_extra_arguments: []

16
roles/matrix-bot-maubot/tasks/setup_install.yml
View File

@ -26,15 +26,15 @@
matrix_bot_maubot_matrix_nginx_proxy_configuration: | matrix_bot_maubot_matrix_nginx_proxy_configuration: |
location ~ ^/(_matrix/maubot/.*) { location ~ ^/(_matrix/maubot/.*) {
{% if matrix_nginx_proxy_enabled|default(False) %} {% if matrix_nginx_proxy_enabled|default(False) %}
{# Use the embedded DNS resolver in Docker containers to discover the service #} {# Use the embedded DNS resolver in Docker containers to discover the service #}
resolver 127.0.0.11 valid=5s; resolver 127.0.0.11 valid=5s;
set $backend "matrix-maubot:{{ matrix_bot_maubot_port }}/$1"; set $backend "matrix-bot-maubot:29316/$1";
proxy_pass http://$backend; proxy_pass http://$backend;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
{% else %} {% else %}
{# Generic configuration for use outside of our container setup #} {# Generic configuration for use outside of our container setup #}
proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_port }}/$1; proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_port }}/$1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
{% endif %} {% endif %}

4
roles/matrix-bot-maubot/templates/config/config.yaml.j2
View File

@ -3,12 +3,12 @@
# Format examples: # Format examples:
# SQLite: sqlite:///filename.db # SQLite: sqlite:///filename.db
# Postgres: postgresql://username:password@hostname/dbname # Postgres: postgresql://username:password@hostname/dbname
database: {{ matrix_bot_maubot_storage_database|to_json }} database: {{ matrix_bot_maubot_database_uri|to_json }}
# Separate database URL for the crypto database. "default" means use the same database as above. # Separate database URL for the crypto database. "default" means use the same database as above.
crypto_database: crypto_database:
type: default type: default
postgres_uri: {{ matrix_bot_maubot_storage_database|to_json }} postgres_uri: {{ matrix_bot_maubot_database_uri|to_json }}
# Additional arguments for asyncpg.create_pool() or sqlite3.connect() # Additional arguments for asyncpg.create_pool() or sqlite3.connect()
# https://magicstack.github.io/asyncpg/current/api/index.html#asyncpg.pool.create_pool # https://magicstack.github.io/asyncpg/current/api/index.html#asyncpg.pool.create_pool