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

[fix] role:dokuwiki

Browse source
This commit is contained in:
roydfalk 2024-03-21 23:43:20 +01:00
parent 947f6e0e74
commit d5dc2c15e5
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ansible/roles/dokuwiki/info.md
View file

@ -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) - [Dokumentation | Ansible](https://www.dokuwiki.org/install:ansible)
- [Plugin: oAuth](https://www.dokuwiki.org/plugin:oauth) - [Plugin: oAuth](https://www.dokuwiki.org/plugin:oauth)
- [Plugin: oAuthGeneric](https://www.dokuwiki.org/plugin:oauthgeneric) - [Plugin: oAuthGeneric](https://www.dokuwiki.org/plugin:oauthgeneric)
## ToDo
- Admin-Passwort richten

2
ansible/roles/dokuwiki/tasks/main.json
View file

@ -168,7 +168,7 @@
"name": "admin user password", "name": "admin user password",
"when": "var_dokuwiki_admin_user_define", "when": "var_dokuwiki_admin_user_define",
"ansible.builtin.set_fact": { "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')}}"
} }
}, },
{ {

4
ansible/roles/dokuwiki/templates/conf-local.php.j2
View file

@ -11,7 +11,7 @@ $conf['authtype'] = 'authplain';
{% if var_dokuwiki_authentication_kind == 'generic' %} {% if var_dokuwiki_authentication_kind == 'generic' %}
$conf['authtype'] = 'oauth'; $conf['authtype'] = 'oauth';
$conf['disableactions'] = 'register,resendpwd,profile,profile_delete'; $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']['oauth']['register-on-auth'] = 1;
$conf['plugin']['oauthgeneric']['key'] = '{{var_dokuwiki_authentication_data_generic_client_id}}'; $conf['plugin']['oauthgeneric']['key'] = '{{var_dokuwiki_authentication_data_generic_client_id}}';
$conf['plugin']['oauthgeneric']['secret'] = '{{var_dokuwiki_authentication_data_generic_client_secret}}'; $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' %} {% if var_dokuwiki_authentication_kind == 'authelia' %}
$conf['authtype'] = 'oauth'; $conf['authtype'] = 'oauth';
$conf['disableactions'] = 'register,resendpwd,profile,profile_delete'; $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']['oauth']['register-on-auth'] = 1;
$conf['plugin']['oauthgeneric']['key'] = '{{var_dokuwiki_authentication_data_authelia_client_id}}'; $conf['plugin']['oauthgeneric']['key'] = '{{var_dokuwiki_authentication_data_authelia_client_id}}';
$conf['plugin']['oauthgeneric']['secret'] = '{{var_dokuwiki_authentication_data_authelia_client_secret}}'; $conf['plugin']['oauthgeneric']['secret'] = '{{var_dokuwiki_authentication_data_authelia_client_secret}}';