From 0d133de1b879e356a8a92135e23170cdf6751c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= <greg@karekinian.com>
Date: Wed, 11 May 2022 16:21:51 +0200
Subject: [PATCH] New config and credentials for LDAP connection in mediawiki

---
 data_bags/credentials/mediawiki.json           | 18 +++++++++---------
 .../kosmos-mediawiki/recipes/default.rb        |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/data_bags/credentials/mediawiki.json b/data_bags/credentials/mediawiki.json
index 24ba630..85e798d 100644
--- a/data_bags/credentials/mediawiki.json
+++ b/data_bags/credentials/mediawiki.json
@@ -1,23 +1,23 @@
 {
   "id": "mediawiki",
   "db_pass": {
-    "encrypted_data": "bkvlD9N8a2EAoBDRcJ5Yhio7vQPnc5qMxH3Of/A/epieJZXBudkYrDaQZmbu\nSwYseFveqEleys4IbI+zTOaBN5LejDpH\n",
-    "iv": "OPbDsQjNBP7Yabsx\n",
-    "auth_tag": "0cl2nkL0V07cWC5SZjNXBA==\n",
+    "encrypted_data": "giNnksOeZDSsoBSsF/RvaVIbtgp5EpRJnbZdH4nt755Tx3ZjHj8Hl6kvXo2t\n34l6/6jjwUIiig1vxKt8+2pHm1hXAbJ9\n",
+    "iv": "hnDHoyGbZyuQVG5f\n",
+    "auth_tag": "3oNeFn22P25qwJ0KaVerxw==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "ldap_user": {
-    "encrypted_data": "+iKtv/pB8rU0kJYlhr/KNUM63uG5RpDUCduW9sakxwaMs7V5JetSdaUmabIk\np8EiF5FDvYLUWqq5SOblTfPELMY3C0j5XwgxDKo=\n",
-    "iv": "ynjajkZHawmcE81H\n",
-    "auth_tag": "cxcsojaQW8dFZHR50QnZjw==\n",
+    "encrypted_data": "bA21rCjUKGFMxSK3BSmKmIe7JS4C8IU062abpRAe8OBqypLgbgv+YpPiF+v3\nscfMaydHNg9qtK1MzP33MmRkI43q7o2TJXpI6+vZA2Y=\n",
+    "iv": "78mNymw45lR0spXg\n",
+    "auth_tag": "3RdUdoQsquNLUAV+POkcRQ==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "ldap_password": {
-    "encrypted_data": "Kb5/RiGyXEf0X4KAgprCrZU+lFaWYuu6gjSXanujWxXx5YUdQLzZ\n",
-    "iv": "U1JBexbrnmJ4HNSZ\n",
-    "auth_tag": "LDeG8mOM5iLxy/VslTakSg==\n",
+    "encrypted_data": "lEaG+bHkMftmJENQ99h+HfRaYFYw4HI/ugwfwKJU2A==\n",
+    "iv": "31oRFt2sXKay+sy1\n",
+    "auth_tag": "tfkRa3lUZkj2PTl39APTTw==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   }
diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb
index 1024296..5046629 100644
--- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb
+++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb
@@ -27,6 +27,7 @@
 include_recipe 'apt'
 include_recipe 'ark'
 include_recipe 'composer'
+include_recipe 'kosmos-dirsrv::hostsfile'
 
 server_name = 'wiki.kosmos.org'
 
@@ -158,7 +159,7 @@ if node["mediawiki"]["ldap_enabled"]
   package "php-ldap"
 
   ldap_domain = node['kosmos-dirsrv']['master_hostname']
-  ldap_encryption_type = node.chef_environment == "development" ? "clear" : "tls"
+  ldap_encryption_type = "clear"
   ldap_base = "ou=kosmos.org,cn=users,dc=kosmos,dc=org"
 end