diff --git a/ansible/roles/dokuwiki/info.md b/ansible/roles/dokuwiki/info.md index 33c0bd2..25eac97 100644 --- a/ansible/roles/dokuwiki/info.md +++ b/ansible/roles/dokuwiki/info.md @@ -9,8 +9,3 @@ Für das leicht-gewichtige Wiki-System [DokuWiki](https://www.dokuwiki.org/dokuw - [Dokumentation | Ansible](https://www.dokuwiki.org/install:ansible) - [Plugin: oAuth](https://www.dokuwiki.org/plugin:oauth) - [Plugin: oAuthGeneric](https://www.dokuwiki.org/plugin:oauthgeneric) - - -## ToDo - -- Admin-Passwort richten diff --git a/ansible/roles/dokuwiki/tasks/main.json b/ansible/roles/dokuwiki/tasks/main.json index 240e17f..f404c5b 100644 --- a/ansible/roles/dokuwiki/tasks/main.json +++ b/ansible/roles/dokuwiki/tasks/main.json @@ -168,7 +168,7 @@ "name": "admin user password", "when": "var_dokuwiki_admin_user_define", "ansible.builtin.set_fact": { - "temp_password_hash": "{{var_dokuwiki_admin_user_password | ansible.builtin.password_hash(hashtype='bcrypt',rounds=12)}}" + "temp_password_hash": "{{var_dokuwiki_admin_user_password | ansible.builtin.password_hash(hashtype='sha512')}}" } }, { diff --git a/ansible/roles/dokuwiki/templates/conf-local.php.j2 b/ansible/roles/dokuwiki/templates/conf-local.php.j2 index d216e64..b3bed42 100644 --- a/ansible/roles/dokuwiki/templates/conf-local.php.j2 +++ b/ansible/roles/dokuwiki/templates/conf-local.php.j2 @@ -11,7 +11,7 @@ $conf['authtype'] = 'authplain'; {% if var_dokuwiki_authentication_kind == 'generic' %} $conf['authtype'] = 'oauth'; $conf['disableactions'] = 'register,resendpwd,profile,profile_delete'; -$conf['plugin']['oauth']['singleService'] = 1; +$conf['plugin']['oauth']['singleService'] = 0; $conf['plugin']['oauth']['register-on-auth'] = 1; $conf['plugin']['oauthgeneric']['key'] = '{{var_dokuwiki_authentication_data_generic_client_id}}'; $conf['plugin']['oauthgeneric']['secret'] = '{{var_dokuwiki_authentication_data_generic_client_secret}}'; @@ -31,7 +31,7 @@ $conf['plugin']['oauthgeneric']['color'] = '#333333'; {% if var_dokuwiki_authentication_kind == 'authelia' %} $conf['authtype'] = 'oauth'; $conf['disableactions'] = 'register,resendpwd,profile,profile_delete'; -$conf['plugin']['oauth']['singleService'] = 1; +$conf['plugin']['oauth']['singleService'] = 0; $conf['plugin']['oauth']['register-on-auth'] = 1; $conf['plugin']['oauthgeneric']['key'] = '{{var_dokuwiki_authentication_data_authelia_client_id}}'; $conf['plugin']['oauthgeneric']['secret'] = '{{var_dokuwiki_authentication_data_authelia_client_secret}}';