From 89d806c27a732415bd8b9469142c64eacca93850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Fra=C3=9F?= <frass@greenscale.de>
Date: Mon, 18 Dec 2023 08:40:46 +0100
Subject: [PATCH] [int]

---
 ansible/roles/dokuwiki-and-nginx/templates/conf.j2      | 2 +-
 ansible/roles/dokuwiki/tasks/main.json                  | 7 +++----
 ansible/roles/dokuwiki/templates/conf-local.php.j2      | 4 ++--
 ansible/roles/dokuwiki/templates/conf-users.auth.php.j2 | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/dokuwiki-and-nginx/templates/conf.j2 b/ansible/roles/dokuwiki-and-nginx/templates/conf.j2
index 3fa71ba..cd9c68d 100644
--- a/ansible/roles/dokuwiki-and-nginx/templates/conf.j2
+++ b/ansible/roles/dokuwiki-and-nginx/templates/conf.j2
@@ -27,7 +27,7 @@ server {
 	
 	#Remember to comment the below out when you're installing, and uncomment it when done.
 	location ~ /(conf/|bin/|inc/|vendor/|install.php) {
-		# deny all;
+		deny all;
 	}
 	
 	#Support for X-Accel-Redirect
diff --git a/ansible/roles/dokuwiki/tasks/main.json b/ansible/roles/dokuwiki/tasks/main.json
index c4c0563..d3ec7ee 100644
--- a/ansible/roles/dokuwiki/tasks/main.json
+++ b/ansible/roles/dokuwiki/tasks/main.json
@@ -6,8 +6,7 @@
 			"pkg": [
 				"unzip",
 				"php8.2-fpm",
-				"php8.2-xml",
-				"php8.2-json"
+				"php8.2-xml"
 			]
 		}
 	},
@@ -147,8 +146,8 @@
 	{
 		"name": "admin user | password hash",
 		"when": "var_dokuwiki_admin_user_define",
-		"set_fact": {
-			"temp_password_hash": "{{var_dokuwiki_admin_user_password | ansible.builtin.password_hash(hashtype=blowfish,rounds=10)}}"
+		"ansible.builtin.set_fact": {
+			"temp_password_hash": "{{var_dokuwiki_admin_user_password | ansible.builtin.password_hash(hashtype='blowfish',rounds=10)}}"
 		}
 	},
 	{
diff --git a/ansible/roles/dokuwiki/templates/conf-local.php.j2 b/ansible/roles/dokuwiki/templates/conf-local.php.j2
index 194df94..7878a7d 100644
--- a/ansible/roles/dokuwiki/templates/conf-local.php.j2
+++ b/ansible/roles/dokuwiki/templates/conf-local.php.j2
@@ -7,7 +7,7 @@ $conf['superuser'] = '@admin';
 $conf['disableactions'] = 'register';
 
 {% if var_dokuwiki_oauth2_enable %}
-$conf['authtype']    = 'oauth';
+$conf['authtype'] = 'oauth';
 $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}}';
@@ -19,5 +19,5 @@ $conf['plugin']['oauthgeneric']['json-name'] = '.name';
 $conf['plugin']['oauthgeneric']['json-mail'] = '.email';
 $conf['plugin']['oauthgeneric']['label'] = '{{var_dokuwiki_oauth2_title}}';
 {% else %}
-$conf['authtype']    = 'authplain';
+$conf['authtype'] = 'authplain';
 {% endif %}
diff --git a/ansible/roles/dokuwiki/templates/conf-users.auth.php.j2 b/ansible/roles/dokuwiki/templates/conf-users.auth.php.j2
index 8c09514..972be0b 100644
--- a/ansible/roles/dokuwiki/templates/conf-users.auth.php.j2
+++ b/ansible/roles/dokuwiki/templates/conf-users.auth.php.j2
@@ -5,5 +5,5 @@
 # Userfile
 
 {% 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 %}