diff --git a/roles/authelia/templates/conf-main.json.j2 b/roles/authelia/templates/conf-main.json.j2 index b2b267d..81bee44 100644 --- a/roles/authelia/templates/conf-main.json.j2 +++ b/roles/authelia/templates/conf-main.json.j2 @@ -192,13 +192,13 @@ "issuer_private_key": "{{temp_tls_result.privatekey | replace('\n', '\\n')}}", "lifespans": { "access_token": "{{var_authelia_oidc_lifespan_access_token}}", - "authorization_code": "{{var_authelia_oidc_lifespan_authorization_code}}" + "refresh_token": "{{var_authelia_oidc_lifespan_refresh_token}}" }, "cors": { "allowed_origins_from_client_redirect_uris": true -{% if oidc_cors_endpoints is None %} +{% if var_authelia_oidc_cors_endpoints == None %} {% else %} - ,"endpoints": {{var_authelia_oidc_cors_endpoints | json}} + ,"endpoints": {{var_authelia_oidc_cors_endpoints | to_json}} {% endif %} }, "clients": [ diff --git a/roles/hedgedoc-and-nginx/templates/conf.j2 b/roles/hedgedoc-and-nginx/templates/conf.j2 index e8fe34b..b9c6601 100644 --- a/roles/hedgedoc-and-nginx/templates/conf.j2 +++ b/roles/hedgedoc-and-nginx/templates/conf.j2 @@ -49,3 +49,4 @@ server { {{ hedgedoc_common() }} } +{% endif %} diff --git a/roles/hedgedoc/tasks/main.json b/roles/hedgedoc/tasks/main.json index b4fd779..5347cc1 100644 --- a/roles/hedgedoc/tasks/main.json +++ b/roles/hedgedoc/tasks/main.json @@ -27,7 +27,8 @@ "become": true, "ansible.builtin.user": { "name": "{{var_hedgedoc_user_name}}", - "create_home": true + "create_home": true, + "home": "{{var_hedgedoc_directory}}" } }, { diff --git a/roles/murmur/tasks/main.json b/roles/murmur/tasks/main.json index 5b61756..f6c84a6 100644 --- a/roles/murmur/tasks/main.json +++ b/roles/murmur/tasks/main.json @@ -15,7 +15,7 @@ "become": true, "ansible.builtin.file": { "state": "directory", - "path": "/var/murmur" + "path": "/var/murmurd" } }, { @@ -23,11 +23,10 @@ "when": "var_murmur_tls", "become": true, "loop": [ - {"from": "/etc/ssl/private/{{var_murmur_domain}}.pem", "to": "/var/murmur/tls-key.pem"}, - {"from": "/etc/ssl/fullchains/{{var_murmur_domain}}.pem", "to": "/var/murmur/tls-fullchain.pem"} + {"from": "/etc/ssl/private/{{var_murmur_domain}}.pem", "to": "/var/murmurd/tls-key.pem"}, + {"from": "/etc/ssl/fullchains/{{var_murmur_domain}}.pem", "to": "/var/murmurd/tls-fullchain.pem"} ], "ansible.builtin.copy": { - "state": "directory", "remote_src": true, "src": "{{item.from}}", "dest": "{{item.to}}",