From e49223e043a2903712e65e77cc4de600094bfa77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Fra=C3=9F?= Date: Tue, 12 Dec 2023 11:49:52 +0100 Subject: [PATCH 1/3] [mod] role:postgresql:minor stuff --- ansible/roles/postgresql/tasks/main.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/postgresql/tasks/main.json b/ansible/roles/postgresql/tasks/main.json index b5d7a50..d870dc8 100644 --- a/ansible/roles/postgresql/tasks/main.json +++ b/ansible/roles/postgresql/tasks/main.json @@ -10,13 +10,13 @@ }, { "name": "get version", - "ansible.builtin.command": { - "cmd": "ls /etc/postgresql" + "ansible.builtin.shell": { + "cmd": "ls /etc/postgresql | sort -n | tail -n 1" }, "register": "temp_version_output" }, { - "name": "set port", + "name": "config", "become": true, "ansible.builtin.template": { "src": "postgresql.conf.j2", @@ -24,7 +24,7 @@ } }, { - "name": "restart service", + "name": "apply", "become": true, "ansible.builtin.systemd_service": { "state": "restarted", From 9a01b674b3b1b29b16067d78f2671e9cedce10ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Fra=C3=9F?= Date: Tue, 12 Dec 2023 11:57:33 +0100 Subject: [PATCH 2/3] [fix] postgresql invocation for synapse --- .../roles/postgresql-for-synapse/defaults/main.json | 5 +++++ .../tasks/main.json | 12 ++++++------ .../defaults/main.json | 7 ------- ansible/roles/postgresql:client-for-synapse/info.md | 3 --- .../postgresql:client-for-synapse/tasks/main.json | 10 ---------- .../templates/database.yaml.j2 | 10 ---------- .../defaults/main.json | 5 ----- ansible/roles/synapse/defaults/main.json | 6 ++++++ ansible/roles/synapse/info.md | 3 ++- ansible/roles/synapse/templates/homeserver.yaml.j2 | 13 +++++++++++++ 10 files changed, 32 insertions(+), 42 deletions(-) create mode 100644 ansible/roles/postgresql-for-synapse/defaults/main.json rename ansible/roles/{postgresql:server-for-synapse => postgresql-for-synapse}/tasks/main.json (66%) delete mode 100644 ansible/roles/postgresql:client-for-synapse/defaults/main.json delete mode 100644 ansible/roles/postgresql:client-for-synapse/info.md delete mode 100644 ansible/roles/postgresql:client-for-synapse/tasks/main.json delete mode 100644 ansible/roles/postgresql:client-for-synapse/templates/database.yaml.j2 delete mode 100644 ansible/roles/postgresql:server-for-synapse/defaults/main.json diff --git a/ansible/roles/postgresql-for-synapse/defaults/main.json b/ansible/roles/postgresql-for-synapse/defaults/main.json new file mode 100644 index 0000000..3c4645a --- /dev/null +++ b/ansible/roles/postgresql-for-synapse/defaults/main.json @@ -0,0 +1,5 @@ +{ + "var_postgresql_for_synapse_username": "synapse_user", + "var_postgresql_for_synapse_password": "synapse_password", + "var_postgresql_for_synapse_schema": "synapse" +} diff --git a/ansible/roles/postgresql:server-for-synapse/tasks/main.json b/ansible/roles/postgresql-for-synapse/tasks/main.json similarity index 66% rename from ansible/roles/postgresql:server-for-synapse/tasks/main.json rename to ansible/roles/postgresql-for-synapse/tasks/main.json index 70d54ea..7b6cee0 100644 --- a/ansible/roles/postgresql:server-for-synapse/tasks/main.json +++ b/ansible/roles/postgresql-for-synapse/tasks/main.json @@ -15,8 +15,8 @@ "become_user": "postgres", "community.postgresql.postgresql_user": { "state": "present", - "name": "{{var_postgresql_server_for_synapse_username}}", - "password": "{{var_postgresql_server_for_synapse_password}}" + "name": "{{var_postgresql_for_synapse_username}}", + "password": "{{var_postgresql_for_synapse_password}}" } }, { @@ -26,8 +26,8 @@ "community.postgresql.postgresql_db": { "state": "present", "template": "template0", - "name": "{{var_postgresql_server_for_synapse_schema}}", - "owner": "{{var_postgresql_server_for_synapse_username}}", + "name": "{{var_postgresql_for_synapse_schema}}", + "owner": "{{var_postgresql_for_synapse_username}}", "encoding": "UTF-8", "lc_collate": "C", "lc_ctype": "C" @@ -39,9 +39,9 @@ "become_user": "postgres", "community.postgresql.postgresql_privs": { "state": "present", - "db": "{{var_postgresql_server_for_synapse_schema}}", + "db": "{{var_postgresql_for_synapse_schema}}", "objs": "ALL_IN_SCHEMA", - "roles": "{{var_postgresql_server_for_synapse_username}}", + "roles": "{{var_postgresql_for_synapse_username}}", "privs": "ALL", "grant_option": true } diff --git a/ansible/roles/postgresql:client-for-synapse/defaults/main.json b/ansible/roles/postgresql:client-for-synapse/defaults/main.json deleted file mode 100644 index e6aa567..0000000 --- a/ansible/roles/postgresql:client-for-synapse/defaults/main.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "var_postgresql_client_for_synapse_host": "localhost", - "var_postgresql_client_for_synapse_port": "5432", - "var_postgresql_client_for_synapse_username": "synapse_user", - "var_postgresql_client_for_synapse_password": "synapse_password", - "var_postgresql_client_for_synapse_schema": "synapse" -} diff --git a/ansible/roles/postgresql:client-for-synapse/info.md b/ansible/roles/postgresql:client-for-synapse/info.md deleted file mode 100644 index 60c6159..0000000 --- a/ansible/roles/postgresql:client-for-synapse/info.md +++ /dev/null @@ -1,3 +0,0 @@ -## Verweise - -- [Synapse-Dokumentation](https://matrix-org.github.io/synapse/latest/postgres.html#using-postgres) diff --git a/ansible/roles/postgresql:client-for-synapse/tasks/main.json b/ansible/roles/postgresql:client-for-synapse/tasks/main.json deleted file mode 100644 index 11d9e15..0000000 --- a/ansible/roles/postgresql:client-for-synapse/tasks/main.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "name": "emplace configuration file", - "become": true, - "ansible.builtin.template": { - "src": "database.yaml.j2", - "dest": "/etc/matrix-synapse/conf.d/database.yaml" - } - } -] diff --git a/ansible/roles/postgresql:client-for-synapse/templates/database.yaml.j2 b/ansible/roles/postgresql:client-for-synapse/templates/database.yaml.j2 deleted file mode 100644 index 60c4872..0000000 --- a/ansible/roles/postgresql:client-for-synapse/templates/database.yaml.j2 +++ /dev/null @@ -1,10 +0,0 @@ -database: - name: psycopg2 - args: - host: {{var_postgresql_client_for_synapse_host}} - port: {{var_postgresql_client_for_synapse_port}} - database: "{{var_postgresql_client_for_synapse_schema}}" - user: "{{var_postgresql_client_for_synapse_username}}" - password: "{{var_postgresql_client_for_synapse_password}}" - cp_min: 5 - cp_max: 10 diff --git a/ansible/roles/postgresql:server-for-synapse/defaults/main.json b/ansible/roles/postgresql:server-for-synapse/defaults/main.json deleted file mode 100644 index 794f33d..0000000 --- a/ansible/roles/postgresql:server-for-synapse/defaults/main.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "var_postgresql_server_for_synapse_username": "synapse_user", - "var_postgresql_server_for_synapse_password": "synapse_password", - "var_postgresql_server_for_synapse_schema": "synapse" -} diff --git a/ansible/roles/synapse/defaults/main.json b/ansible/roles/synapse/defaults/main.json index 72fc7b1..7c28902 100644 --- a/ansible/roles/synapse/defaults/main.json +++ b/ansible/roles/synapse/defaults/main.json @@ -1,6 +1,12 @@ { "var_synapse_scheme": "https", "var_synapse_domain": "matrix.example.org", + "var_synaspe_database_kind": "postgresql", + "var_synaspe_database_postgresql_host": "localhost", + "var_synaspe_database_postgresql_port": "5432", + "var_synaspe_database_postgresql_username": "synapse_user", + "var_synaspe_database_postgresql_password": "synapse_password", + "var_synaspe_database_postgresql_schema": "synapse" "var_synapse_element_url": "https://element.example.org", "var_synapse_title": "Example | Matrix", "var_synapse_federation_whitelist": "[]", diff --git a/ansible/roles/synapse/info.md b/ansible/roles/synapse/info.md index b098a2c..9f4407e 100644 --- a/ansible/roles/synapse/info.md +++ b/ansible/roles/synapse/info.md @@ -1,10 +1,11 @@ ## Beschreibung +Zur Einrichtung des [matrix.org](https://matrix.org/)-Servers Synapse ## Verweise -- [matrix.org](https://matrix.org/) - [ubuntuusers-Wiki-Eintrag](https://wiki.ubuntuusers.de/Matrix_synapse/) - [GitHub-Repository](https://github.com/matrix-org/synapse) - [Configuration Manual](https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html) +- [Dokumentation | PostgreSQL](https://matrix-org.github.io/synapse/latest/postgres.html#using-postgres) diff --git a/ansible/roles/synapse/templates/homeserver.yaml.j2 b/ansible/roles/synapse/templates/homeserver.yaml.j2 index 0dc29ce..e923528 100644 --- a/ansible/roles/synapse/templates/homeserver.yaml.j2 +++ b/ansible/roles/synapse/templates/homeserver.yaml.j2 @@ -1,3 +1,16 @@ +{% if var_synaspe_database_kind == 'postgresql' %} +database: + name: psycopg2 + args: + host: {{var_synapse_database_postgresql_host}} + port: {{var_synapse_database_postgresql_port}} + database: "{{var_synapse_database_postgresql_schema}}" + user: "{{var_synapse_database_postgresql_username}}" + password: "{{var_synapse_database_postgresql_password}}" + cp_min: 5 + cp_max: 10 +{% endif %} + no_tls: True tls_fingerprints: [] From f8fd3e3093dc3248dbd60be1ec82778f17800e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Fra=C3=9F?= Date: Tue, 12 Dec 2023 11:58:28 +0100 Subject: [PATCH 3/3] [fix] role:synapse --- ansible/roles/synapse/defaults/main.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/synapse/defaults/main.json b/ansible/roles/synapse/defaults/main.json index 7c28902..32550cb 100644 --- a/ansible/roles/synapse/defaults/main.json +++ b/ansible/roles/synapse/defaults/main.json @@ -6,7 +6,7 @@ "var_synaspe_database_postgresql_port": "5432", "var_synaspe_database_postgresql_username": "synapse_user", "var_synaspe_database_postgresql_password": "synapse_password", - "var_synaspe_database_postgresql_schema": "synapse" + "var_synaspe_database_postgresql_schema": "synapse", "var_synapse_element_url": "https://element.example.org", "var_synapse_title": "Example | Matrix", "var_synapse_federation_whitelist": "[]",