From: Tom Hughes <tom@compton.nu>
Date: Tue, 2 Feb 2021 14:23:52 +0000 (+0000)
Subject: Merge remote-tracking branch 'github/pull/388'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/cf104d6ba87464701b5abe7ce7264ecbc0c261b9?hp=09672cec42acd4e7a0ba08300d7bf5ee8f4f55fc

Merge remote-tracking branch 'github/pull/388'
---

diff --git a/cookbooks/civicrm/attributes/default.rb b/cookbooks/civicrm/attributes/default.rb
index d39879eb0..abc91e401 100644
--- a/cookbooks/civicrm/attributes/default.rb
+++ b/cookbooks/civicrm/attributes/default.rb
@@ -1,4 +1,4 @@
-default[:civicrm][:version] = "5.31.0"
+default[:civicrm][:version] = "5.33.2"
 
 default[:civicrm][:extensions][:cividiscount][:name] = "org.civicrm.module.cividiscount"
 default[:civicrm][:extensions][:cividiscount][:repository] = "https://github.com/dlobo/org.civicrm.module.cividiscount.git"
@@ -18,7 +18,7 @@ default[:civicrm][:extensions][:civiruleshttppost][:revision] = "e2c7de5f0fee319
 
 default[:civicrm][:extensions][:civirules][:name] = "org.civicoop.civirules"
 default[:civicrm][:extensions][:civirules][:repository] = "https://lab.civicrm.org/extensions/civirules.git"
-default[:civicrm][:extensions][:civirules][:revision] = "2.19"
+default[:civicrm][:extensions][:civirules][:revision] = "2.20"
 
 default[:civicrm][:extensions][:mailchimp][:name] = "uk.co.vedaconsulting.mailchimp"
 default[:civicrm][:extensions][:mailchimp][:repository] = "https://github.com/veda-consulting/uk.co.vedaconsulting.mailchimp.git"
diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index 99670dc0f..d425bb7fa 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -46,6 +46,7 @@ $wgEnableUserEmail  = true; # UPO
 $wgEmergencyContact = "<%= @mediawiki[:email_contact] %>";
 $wgPasswordSender   = "<%= @mediawiki[:email_sender] %>";
 $wgPasswordSenderName = "<%= @mediawiki[:email_sender_name] %>"; //Replaced by MediaWiki:Emailsender in v1.23.0
+$wgNoReplyAddress = "<%= @mediawiki[:email_sender] %>";
 
 $wgEnotifUserTalk      = true; # UPO
 $wgEnotifWatchlist     = true; # UPO
diff --git a/cookbooks/planet/templates/default/apache.erb b/cookbooks/planet/templates/default/apache.erb
index 3e79123f2..f8bf0dc7e 100644
--- a/cookbooks/planet/templates/default/apache.erb
+++ b/cookbooks/planet/templates/default/apache.erb
@@ -64,6 +64,10 @@
         RewriteRule ^(/cc\-by\-sa/changesets\-latest\.osm\.bz2)$        ${latestplanet:$1} [R,L]
         RewriteRule ^(/cc\-by\-sa/relations\-latest\.osm\.bz2)$         ${latestplanet:$1} [R,L]
 
+        # Block an abusive fake user agent
+        RewriteCond %{HTTP_USER_AGENT} "=Mozilla/5.0 (Linux; Android) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.131 Safari/537.36"
+        RewriteRule /.*$ - [F,L]
+
         # Temporary download rate limit due to upstream fibre connection issues. - 13 Jan 2020
         <FilesMatch ".+\.(7z|bz2|gz|pbf|tgz|xz)$">
           SetOutputFilter RATE_LIMIT
diff --git a/roles/wiki.rb b/roles/wiki.rb
index 21f6ea8a4..e70b5f53f 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -24,7 +24,7 @@ default_attributes(
     }
   },
   :exim => {
-    :trusted_users => ["www-data"],
+    :trusted_users => ["www-data", "wiki"],
     :aliases => {
       :root => "grant"
     },