diff --git a/roles/authelia/tasks/main.json b/roles/authelia/tasks/main.json index 7893041..6502607 100644 --- a/roles/authelia/tasks/main.json +++ b/roles/authelia/tasks/main.json @@ -68,7 +68,7 @@ "name": "configuration", "block": [ { - "name": "compose script", + "name": "configuration | compose script", "become": true, "ansible.builtin.copy": { "src": "conf-compose.py", @@ -77,7 +77,7 @@ } }, { - "name": "directories", + "name": "configuration | directories", "become": true, "loop": [ "/etc/authelia/conf.d", @@ -89,7 +89,7 @@ } }, { - "name": "main", + "name": "configuration | main", "become": true, "ansible.builtin.template": { "src": "conf-main.json.j2", @@ -97,7 +97,7 @@ } }, { - "name": "compose", + "name": "configuration | compose", "become": true, "ansible.builtin.command": { "cmd": "/usr/bin/authelia-conf-compose --main-file-path=/etc/authelia/conf.d/main.json --clients-directory-path=/etc/authelia/conf.d/clients --output-format=yaml --output-path=/etc/authelia/configuration.yml" @@ -110,6 +110,8 @@ "become": true, "ansible.builtin.file": { "state": "directory", + "owner": "authelia", + "group": "authelia", "path": "{{cfg_authelia.log_file_path | dirname}}" } }, @@ -121,6 +123,8 @@ "become": true, "ansible.builtin.file": { "state": "directory", + "owner": "authelia", + "group": "authelia", "path": "{{cfg_authelia.users_file_path | dirname}}" } }, diff --git a/roles/owncloud/info.md b/roles/owncloud/info.md index fdf6627..962bd4f 100644 --- a/roles/owncloud/info.md +++ b/roles/owncloud/info.md @@ -9,8 +9,8 @@ Cloud-Plattform [ownCloud](https://owncloud.com/) (the rewrite in Go named "Infi - [ownCloud-Dokumentation | oCIS](https://owncloud.dev/ocis/) - [ownCloud-Dokumentation | Upgrading](https://doc.owncloud.com/ocis/next/migration/upgrading-ocis.html) - [ownCloud-Dokumentation | env var types](https://doc.owncloud.com/ocis/next/deployment/services/envvar-types-description.html) -- [ownCloud-Dokumentation | Service | Proxy](https://doc.owncloud.com/ocis/next/deployment/services/s-list/proxy.html) - [ownCloud-Dokumentation | Service | Web](https://doc.owncloud.com/ocis/next/deployment/services/s-list/web.html) +- [ownCloud-Dokumentation | Service | Proxy](https://doc.owncloud.com/ocis/next/deployment/services/s-list/proxy.html) - [ownCloud-Dokumentation | Service | Sharing](https://doc.owncloud.com/ocis/next/deployment/services/s-list/sharing.html) - [GitHub | ocis](https://github.com/owncloud/ocis/) - [ownCloud-Foren | OCIS + Authelia](https://central.owncloud.org/t/ocis-authelia/44222) diff --git a/roles/owncloud/tasks/main.json b/roles/owncloud/tasks/main.json index 147e58b..4bfed90 100644 --- a/roles/owncloud/tasks/main.json +++ b/roles/owncloud/tasks/main.json @@ -44,9 +44,20 @@ "become_user": "{{cfg_owncloud.user}}", "ansible.builtin.template": { "src": "csp.yaml.j2", + "mode": "644", "dest": "{{cfg_owncloud.directory}}/csp.yaml" } }, + { + "name": "env", + "become": true, + "become_user": "{{cfg_owncloud.user}}", + "ansible.builtin.template": { + "src": "env.j2", + "mode": "644", + "dest": "{{cfg_owncloud.directory}}/.env" + } + }, { "name": "setup", "become": true, @@ -56,15 +67,6 @@ "cmd": "rm -f {{cfg_owncloud.directory}}/.ocis/config/ocis.yaml && ./ocis init --insecure no --admin-password={{cfg_owncloud.admin_password}}" } }, - { - "name": "configuration", - "become": true, - "become_user": "{{cfg_owncloud.user}}", - "ansible.builtin.template": { - "src": "env.j2", - "dest": "{{cfg_owncloud.directory}}/.env" - } - }, { "name": "systemd unit", "become": true, diff --git a/roles/owncloud/templates/env.j2 b/roles/owncloud/templates/env.j2 index 17d0957..6511309 100644 --- a/roles/owncloud/templates/env.j2 +++ b/roles/owncloud/templates/env.j2 @@ -12,6 +12,8 @@ WEB_OIDC_RESPONSE_TYPE=code WEB_OIDC_SCOPE=openid profile email groups WEB_OPTION_LOGIN_URL={{cfg_owncloud.authentication.data.url_base}} WEB_OPTION_LOGOUT_URL={{cfg_owncloud.authentication.data.url_base}} +WEB_UI_THEME_SERVER={{cfg_owncloud.domain}} +WEB_UI_CONFIG_SERVER={{cfg_owncloud.domain}} {% endif %} ## other clients