From c4fdf1779fc819c780cfed1cf9ee21f88cd1dfd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= <greg@karekinian.com>
Date: Thu, 20 Feb 2020 14:31:39 +0100
Subject: [PATCH] Remove the CleanTalk Antispam extension

It is not needed anymore now that registration is closed and only LDAP
accounts can edit or create pages

Closes #130
---
 data_bags/credentials/mediawiki.json          | 25 +++++++------------
 .../kosmos-mediawiki/recipes/default.rb       | 17 -------------
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/data_bags/credentials/mediawiki.json b/data_bags/credentials/mediawiki.json
index 94fafcf..ab31ef3 100644
--- a/data_bags/credentials/mediawiki.json
+++ b/data_bags/credentials/mediawiki.json
@@ -1,30 +1,23 @@
 {
   "id": "mediawiki",
-  "antispam_key": {
-    "encrypted_data": "OD5RrVaQoUFbGV1Xs6i3hqZ024IJsbOC4CAWzrw5jQ==\n",
-    "iv": "8sfvTg7uGe1ofS2C\n",
-    "auth_tag": "hquilck+xxOQqHjE+szPgA==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
   "db_pass": {
-    "encrypted_data": "2IntmJdBmfGyHghAXDJnaew58u9dvjKCz/q1Uivs8Q+nH3wVqARkf52BIHhZ\nbIHY3cy50EwcKTxDcr1arQFmb88cKBxt\n",
-    "iv": "pkCrp07s4LJfaPmq\n",
-    "auth_tag": "yBsriBc/X2bP6v25NY3cSg==\n",
+    "encrypted_data": "KfJnSZ5/8WBYXik5TE1SOZTZMhMObSzZpXX17Mygwx0eGqo29sBIQwbAI0+A\nKfe1N4DuyyQpBjNDpmi+yiIjBuG4RfUj\n",
+    "iv": "zGkF0xLeyjXA1aUc\n",
+    "auth_tag": "7U/g32H1SfJHdZSECmgU1A==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "ldap_user": {
-    "encrypted_data": "l/Q63Mvm/tANfvZ+1ijjTB1lpirOhAjWDz4k+R1OkzYIXQNwo6VM2saTH2eu\nBNHFLTyUSMqzlAcq6OvH++En05wk\n",
-    "iv": "y+n/Lo8t6O3Ab4/+\n",
-    "auth_tag": "7eHYjF8A0T611Y+JT1GeJg==\n",
+    "encrypted_data": "CerXTmZNO3mbzevNFn/qbtdeOWx37qFOyCuKznRw9I+nSl+hZ3dP6PUJ+iIg\nSAM2ebvwHyXC1Jz+Aah0AFjw+D+7\n",
+    "iv": "wi5xB/lUm3AQtkTZ\n",
+    "auth_tag": "WhdFRt/rlkfmBb9pb9tkvw==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "ldap_password": {
-    "encrypted_data": "+qYb9F/f9QRRCTsMoRIyWWVQyCSLcQRHSPWD2Nf7z7Kauywh1zIg\n",
-    "iv": "sivNzq6G+mScbRnn\n",
-    "auth_tag": "ybUpDlIOJm0bsqlY5qt1xA==\n",
+    "encrypted_data": "RZmfQbctKnPGJm97ZMMrtDFGYx8sPzlJIy3saeUXugEEL3HtE39s\n",
+    "iv": "taEQ/4xRIrQCIkR9\n",
+    "auth_tag": "2mdevdW0Oh/l/cKCyePW3Q==\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 aae872d..e52bf72 100644
--- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb
+++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb
@@ -106,19 +106,6 @@ nginx_certbot_site server_name
 
 mediawiki_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mediawiki')
 
-#
-# Cleantalk Antispam
-#
-
-ark "antispam" do
-  url "https://github.com/CleanTalk/mediawiki-antispam/archive/2.1.zip"
-  path "#{node['mediawiki']['webdir']}/extensions/Antispam"
-  owner node["nginx"]["user"]
-  group node["nginx"]["group"]
-  mode 0750
-  action :dump
-end
-
 #
 # MediawikiHubot extension
 #
@@ -225,10 +212,6 @@ $wgPasswordReminderResendTime = 0;
 $wgArticlePath = "/$1";
                                  EOF
                                 )
-    file.insert_line_if_no_match(/Antispam\.php/,
-                                 "require_once \"$IP/extensions/Antispam/Antispam.php\";")
-    file.insert_line_if_no_match(/wgCTAccessKey/,
-                                 "$wgCTAccessKey = \"#{mediawiki_credentials['antispam_key']}\";")
     file.insert_line_if_no_match(/MediawikiHubot\.php/,
                                  "require_once \"$IP/extensions/MediawikiHubot/MediawikiHubot.php\";")