kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 26 Pull Requests 2 Projects 2 Activity

Remove the CleanTalk Antispam extension #138

Manually merged
greg merged 1 commits from feature/130-remove_antispam into master 2020-02-20 13:34:17 +00:00
Conversation 0 Commits 1 Files Changed 2 +9 -33
2 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
data_bags/credentials/mediawiki.json
View File

@ -1,30 +1,23 @@
{ {
"id": "mediawiki", "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": { "db_pass": {
"encrypted_data": "2IntmJdBmfGyHghAXDJnaew58u9dvjKCz/q1Uivs8Q+nH3wVqARkf52BIHhZ\nbIHY3cy50EwcKTxDcr1arQFmb88cKBxt\n", "encrypted_data": "KfJnSZ5/8WBYXik5TE1SOZTZMhMObSzZpXX17Mygwx0eGqo29sBIQwbAI0+A\nKfe1N4DuyyQpBjNDpmi+yiIjBuG4RfUj\n",
"iv": "pkCrp07s4LJfaPmq\n", "iv": "zGkF0xLeyjXA1aUc\n",
"auth_tag": "yBsriBc/X2bP6v25NY3cSg==\n", "auth_tag": "7U/g32H1SfJHdZSECmgU1A==\n",
"version": 3, "version": 3,
"cipher": "aes-256-gcm" "cipher": "aes-256-gcm"
}, },
"ldap_user": { "ldap_user": {
"encrypted_data": "l/Q63Mvm/tANfvZ+1ijjTB1lpirOhAjWDz4k+R1OkzYIXQNwo6VM2saTH2eu\nBNHFLTyUSMqzlAcq6OvH++En05wk\n", "encrypted_data": "CerXTmZNO3mbzevNFn/qbtdeOWx37qFOyCuKznRw9I+nSl+hZ3dP6PUJ+iIg\nSAM2ebvwHyXC1Jz+Aah0AFjw+D+7\n",
"iv": "y+n/Lo8t6O3Ab4/+\n", "iv": "wi5xB/lUm3AQtkTZ\n",
"auth_tag": "7eHYjF8A0T611Y+JT1GeJg==\n", "auth_tag": "WhdFRt/rlkfmBb9pb9tkvw==\n",
"version": 3, "version": 3,
"cipher": "aes-256-gcm" "cipher": "aes-256-gcm"
}, },
"ldap_password": { "ldap_password": {
"encrypted_data": "+qYb9F/f9QRRCTsMoRIyWWVQyCSLcQRHSPWD2Nf7z7Kauywh1zIg\n", "encrypted_data": "RZmfQbctKnPGJm97ZMMrtDFGYx8sPzlJIy3saeUXugEEL3HtE39s\n",
"iv": "sivNzq6G+mScbRnn\n", "iv": "taEQ/4xRIrQCIkR9\n",
"auth_tag": "ybUpDlIOJm0bsqlY5qt1xA==\n", "auth_tag": "2mdevdW0Oh/l/cKCyePW3Q==\n",
"version": 3, "version": 3,
"cipher": "aes-256-gcm" "cipher": "aes-256-gcm"
} }

17
site-cookbooks/kosmos-mediawiki/recipes/default.rb
View File

@ -106,19 +106,6 @@ nginx_certbot_site server_name
mediawiki_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mediawiki') 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 # MediawikiHubot extension
# #
@ -225,10 +212,6 @@ $wgPasswordReminderResendTime = 0;
$wgArticlePath = "/$1"; $wgArticlePath = "/$1";
EOF 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/, file.insert_line_if_no_match(/MediawikiHubot\.php/,
"require_once \"$IP/extensions/MediawikiHubot/MediawikiHubot.php\";") "require_once \"$IP/extensions/MediawikiHubot/MediawikiHubot.php\";")