diff --git a/ansible/roles/dokuwiki/tasks/main.json b/ansible/roles/dokuwiki/tasks/main.json index ab9339b..240e17f 100644 --- a/ansible/roles/dokuwiki/tasks/main.json +++ b/ansible/roles/dokuwiki/tasks/main.json @@ -176,7 +176,8 @@ "become": true, "ansible.builtin.template": { "src": "conf-local.php.j2", - "dest": "{{var_dokuwiki_directory}}/conf/local.php" + "dest": "{{var_dokuwiki_directory}}/conf/local.php", + "owner": "www-data" } }, { @@ -184,7 +185,8 @@ "become": true, "ansible.builtin.template": { "src": "conf-plugins.local.php.j2", - "dest": "{{var_dokuwiki_directory}}/conf/plugins.local.php" + "dest": "{{var_dokuwiki_directory}}/conf/plugins.local.php", + "owner": "www-data" } }, { @@ -192,7 +194,8 @@ "become": true, "ansible.builtin.template": { "src": "conf-acl.auth.php.j2", - "dest": "{{var_dokuwiki_directory}}/conf/acl.auth.php" + "dest": "{{var_dokuwiki_directory}}/conf/acl.auth.php", + "owner": "www-data" } }, { @@ -200,7 +203,8 @@ "become": true, "ansible.builtin.template": { "src": "conf-users.auth.php.j2", - "dest": "{{var_dokuwiki_directory}}/conf/users.auth.php" + "dest": "{{var_dokuwiki_directory}}/conf/users.auth.php", + "owner": "www-data" } } ] diff --git a/ansible/roles/dokuwiki/templates/conf-local.php.j2 b/ansible/roles/dokuwiki/templates/conf-local.php.j2 index 50b87bd..25bd096 100644 --- a/ansible/roles/dokuwiki/templates/conf-local.php.j2 +++ b/ansible/roles/dokuwiki/templates/conf-local.php.j2 @@ -7,14 +7,15 @@ $conf['superuser'] = '@admin'; $conf['passcrypt'] = 'bcrypt'; {% if var_dokuwiki_oauth2_enable %} $conf['authtype'] = 'oauth'; -$conf['disableactions'] = 'resendpwd,profile,profile_delete'; +$conf['disableactions'] = 'register,resendpwd,profile,profile_delete'; $conf['plugin']['oauth']['singleService'] = 1; +$conf['plugin']['oauth']['register-on-auth'] = 1; $conf['plugin']['oauthgeneric']['key'] = '{{var_dokuwiki_oauth2_client_id}}'; $conf['plugin']['oauthgeneric']['secret'] = '{{var_dokuwiki_oauth2_client_secret}}'; $conf['plugin']['oauthgeneric']['authurl'] = '{{var_dokuwiki_oauth2_auth_url}}'; $conf['plugin']['oauthgeneric']['tokenurl'] = '{{var_dokuwiki_oauth2_token_url}}'; $conf['plugin']['oauthgeneric']['userurl'] = '{{var_dokuwiki_oauth2_user_url}}'; -$conf['plugin']['oauthgeneric']['authmethod'] = 0; +$conf['plugin']['oauthgeneric']['authmethod'] = 1; $conf['plugin']['oauthgeneric']['scopes'] = ['openid','email','profile','groups']; $conf['plugin']['oauthgeneric']['needs-state'] = 1; $conf['plugin']['oauthgeneric']['json-user'] = 'sub';