misc/ansible-base
0
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

[fix] role:mas

Browse source
This commit is contained in:
roydfalk 2024-10-17 19:29:32 +02:00
parent 8e73310fae
commit e486e595dc
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
roles/mas/tasks/main.json
View file

@ -15,6 +15,7 @@
"{{var_mas_directory}}/conf.d", "{{var_mas_directory}}/conf.d",
"{{var_mas_directory}}/conf.d/providers", "{{var_mas_directory}}/conf.d/providers",
"{{var_mas_directory}}/conf.d/clients", "{{var_mas_directory}}/conf.d/clients",
"{{var_mas_directory}}/secrets",
"{{var_mas_directory}}/scripts" "{{var_mas_directory}}/scripts"
], ],
"ansible.builtin.file": { "ansible.builtin.file": {
@ -52,6 +53,15 @@
"mode": "0555" "mode": "0555"
} }
}, },
{
"name": "configuration | private key",
"become": true,
"become_user": "{{var_mas_user}}",
"community.crypto.openssl_privatekey": {
"curve": "secp384r1",
"path": "{{var_mas_directory}}/secrets/private_key.pem"
}
},
{ {
"name": "configuration | base", "name": "configuration | base",
"become": true, "become": true,

11
roles/mas/templates/config-base.json.j2
View file

@ -1,7 +1,7 @@
{ {
"database": { "database": {
"host": "{{var_mas_database_host}}", "host": "{{var_mas_database_host}}",
"port": "{{var_mas_database_port | string}}", "port": {{var_mas_database_port | string}},
"username": "{{var_mas_database_username}}", "username": "{{var_mas_database_username}}",
"password": "{{var_mas_database_password}}", "password": "{{var_mas_database_password}}",
"database": "{{var_mas_database_schema}}" "database": "{{var_mas_database_schema}}"
@ -61,8 +61,8 @@
"fd00::/8", "fd00::/8",
"::1/128" "::1/128"
], ],
"public_base": "http://{{var_mas_server_address}}]:{{var_mas_server_port | string}}/", "public_base": "http://{{var_mas_server_address}}:{{var_mas_server_port | string}}/",
"issuer": "http://{{var_mas_server_address}}]:{{var_mas_server_port | string}}/" "issuer": "http://{{var_mas_server_address}}:{{var_mas_server_port | string}}/"
}, },
"matrix": { "matrix": {
"homeserver": "{{var_mas_matrix_server}}", "homeserver": "{{var_mas_matrix_server}}",
@ -72,7 +72,10 @@
"secrets": { "secrets": {
"encryption": "{{var_mas_encryption_key}}", "encryption": "{{var_mas_encryption_key}}",
"keys": [ "keys": [
"__TODO__" {
"kid": "x1",
"key_file": "{{var_mas_directory}}/secrets/private_key.pem"
}
] ]
}, },
"passwords": { "passwords": {