X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9c3db8b15ab975e975cb31ca8bb388b79f6e5c8e..9b1a79b6487d04eeafc92f2f856f7e79780ba612:/cookbooks/mediawiki/resources/site.rb

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 4b53c52be..ea468cfde 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,7 +22,7 @@ default_action :create
 property :site, :kind_of => String, :name_attribute => true
 property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String
-property :version, :kind_of => String, :default => "1.29"
+property :version, :kind_of => String, :default => "1.31"
 property :database_name, :kind_of => String, :required => true
 property :database_user, :kind_of => String, :required => true
 property :database_password, :kind_of => String, :required => true
@@ -38,7 +38,6 @@ property :site_notice, :kind_of => [String, TrueClass, FalseClass], :default =>
 property :site_readonly, :kind_of => [String, TrueClass, FalseClass], :default => false
 property :admin_user, :kind_of => String, :default => "Admin"
 property :admin_password, :kind_of => String, :required => true
-property :ssl_enabled, :kind_of => [TrueClass, FalseClass], :default => false
 property :private_accounts, :kind_of => [TrueClass, FalseClass], :default => false
 property :private, :kind_of => [TrueClass, FalseClass], :default => false
 property :recaptcha_public_key, :kind_of => String
@@ -129,7 +128,6 @@ action :create do
   ruby_block "catch-installer-localsettings-run" do
     action :run
     block do
-      #
     end
     not_if do
       ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php")
@@ -370,12 +368,14 @@ action :create do
   mediawiki_extension "AntiSpoof" do
     site new_resource.site
     template "mw-ext-AntiSpoof.inc.php.erb"
+    compose true
     update_site false
   end
 
   mediawiki_extension "AbuseFilter" do
     site new_resource.site
     template "mw-ext-AbuseFilter.inc.php.erb"
+    compose true
     update_site false
   end
 
@@ -392,6 +392,7 @@ action :create do
 
   mediawiki_extension "Elastica" do
     site new_resource.site
+    compose true
     update_site false
   end
 
@@ -431,12 +432,6 @@ action :create do
     action :delete
   end
 
-  mediawiki_extension "MobileFrontend" do
-    site new_resource.site
-    template "mw-ext-MobileFrontend.inc.php.erb"
-    update_site false
-  end
-
   mediawiki_extension "DisableAccount" do
     site new_resource.site
     template "mw-ext-DisableAccount.inc.php.erb"
@@ -475,7 +470,6 @@ action :create do
 
   ssl_certificate new_resource.site do
     domains [new_resource.site] + Array(new_resource.aliases)
-    only_if { new_resource.ssl_enabled }
   end
 
   apache_site new_resource.site do
@@ -483,8 +477,7 @@ action :create do
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),
-              :private => new_resource.private,
-              :ssl_enabled => new_resource.ssl_enabled
+              :private => new_resource.private
     reload_apache false
   end
 
@@ -573,7 +566,6 @@ action_class do
       :skin => new_resource.skin,
       :site_notice => new_resource.site_notice,
       :site_readonly => new_resource.site_readonly,
-      :ssl_enabled => new_resource.ssl_enabled,
       :extra_file_extensions => new_resource.extra_file_extensions,
       :private_accounts => new_resource.private_accounts,
       :private => new_resource.private