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

[int]

Browse source
This commit is contained in:
Christian Fraß 2023-12-18 08:40:46 +01:00
parent acfa9c0745
commit 89d806c27a
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ansible/roles/dokuwiki-and-nginx/templates/conf.j2
View file

@ -27,7 +27,7 @@ server {
#Remember to comment the below out when you're installing, and uncomment it when done. #Remember to comment the below out when you're installing, and uncomment it when done.
location ~ /(conf/|bin/|inc/|vendor/|install.php) { location ~ /(conf/|bin/|inc/|vendor/|install.php) {
# deny all; deny all;
} }
#Support for X-Accel-Redirect #Support for X-Accel-Redirect

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

@ -6,8 +6,7 @@
"pkg": [ "pkg": [
"unzip", "unzip",
"php8.2-fpm", "php8.2-fpm",
"php8.2-xml", "php8.2-xml"
"php8.2-json"
] ]
} }
}, },
@ -147,8 +146,8 @@
{ {
"name": "admin user | password hash", "name": "admin user | password hash",
"when": "var_dokuwiki_admin_user_define", "when": "var_dokuwiki_admin_user_define",
"set_fact": { "ansible.builtin.set_fact": {
"temp_password_hash": "{{var_dokuwiki_admin_user_password | ansible.builtin.password_hash(hashtype=blowfish,rounds=10)}}" "temp_password_hash": "{{var_dokuwiki_admin_user_password | ansible.builtin.password_hash(hashtype='blowfish',rounds=10)}}"
} }
}, },
{ {

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

@ -7,7 +7,7 @@ $conf['superuser'] = '@admin';
$conf['disableactions'] = 'register'; $conf['disableactions'] = 'register';
{% if var_dokuwiki_oauth2_enable %} {% if var_dokuwiki_oauth2_enable %}
$conf['authtype'] = 'oauth'; $conf['authtype'] = 'oauth';
$conf['plugin']['oauthgeneric']['key'] = '{{var_dokuwiki_oauth2_client_id}}'; $conf['plugin']['oauthgeneric']['key'] = '{{var_dokuwiki_oauth2_client_id}}';
$conf['plugin']['oauthgeneric']['secret'] = '{{var_dokuwiki_oauth2_client_secret}}'; $conf['plugin']['oauthgeneric']['secret'] = '{{var_dokuwiki_oauth2_client_secret}}';
$conf['plugin']['oauthgeneric']['authurl'] = '{{var_dokuwiki_oauth2_auth_url}}'; $conf['plugin']['oauthgeneric']['authurl'] = '{{var_dokuwiki_oauth2_auth_url}}';
@ -19,5 +19,5 @@ $conf['plugin']['oauthgeneric']['json-name'] = '.name';
$conf['plugin']['oauthgeneric']['json-mail'] = '.email'; $conf['plugin']['oauthgeneric']['json-mail'] = '.email';
$conf['plugin']['oauthgeneric']['label'] = '{{var_dokuwiki_oauth2_title}}'; $conf['plugin']['oauthgeneric']['label'] = '{{var_dokuwiki_oauth2_title}}';
{% else %} {% else %}
$conf['authtype'] = 'authplain'; $conf['authtype'] = 'authplain';
{% endif %} {% endif %}

2
ansible/roles/dokuwiki/templates/conf-users.auth.php.j2
View file

@ -5,5 +5,5 @@
# Userfile # Userfile
{% if var_dokuwiki_admin_user_define %} {% if var_dokuwiki_admin_user_define %}
{{var_dokuwiki_admin_user_name}}:{{temp_password_hash}}:var_dokuwiki_admin_user_email_address:admin,user {{var_dokuwiki_admin_user_name}}:{{temp_password_hash}}:{{var_dokuwiki_admin_user_email_address}}:admin,user
{% endif %} {% endif %}