Remove some hardcoded matrix-postgres references
This commit is contained in:
@ -138,7 +138,7 @@ matrix_dendrite_metrics_password: "metrics"
|
||||
|
||||
# Postgres database information
|
||||
matrix_dendrite_database_str: "postgresql://{{ matrix_dendrite_database_user }}:{{ matrix_dendrite_database_password }}@{{ matrix_dendrite_database_hostname }}"
|
||||
matrix_dendrite_database_hostname: "matrix-postgres"
|
||||
matrix_dendrite_database_hostname: ''
|
||||
matrix_dendrite_database_user: "dendrite"
|
||||
matrix_dendrite_database_password: "itsasecret"
|
||||
matrix_dendrite_federationapi_database: "dendrite_federationapi"
|
||||
|
@ -5,7 +5,8 @@
|
||||
You need to define a required configuration setting (`{{ item }}`) for using Dendrite.
|
||||
when: "vars[item] == ''"
|
||||
with_items:
|
||||
- "matrix_dendrite_client_api_registration_shared_secret"
|
||||
- matrix_dendrite_client_api_registration_shared_secret
|
||||
- matrix_dendrite_database_hostname
|
||||
|
||||
- name: (Deprecation) Catch and report renamed settings
|
||||
ansible.builtin.fail:
|
||||
|
@ -16,8 +16,8 @@ Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
|
||||
ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} kill matrix-dendrite 2>/dev/null || true'
|
||||
ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-dendrite 2>/dev/null || true'
|
||||
|
||||
{% if 'matrix-postgres.service' in matrix_dendrite_systemd_required_services_list %}
|
||||
# Dendrite is too quick to start in relation to its matrix-postgres dependency.
|
||||
{% if (devture_postgres_identifier + '.service') in matrix_dendrite_systemd_required_services_list %}
|
||||
# Dendrite is too quick to start in relation to its Postgres dependency.
|
||||
# Delay Dendrite startup to avoid failing with: "failed to connect to accounts db" ("pq: the database system is starting up").
|
||||
ExecStartPre={{ matrix_host_command_sleep }} 5
|
||||
{% endif %}
|
||||
|
Reference in New Issue
Block a user