Remove ssl_enabled option for mediawiki sites

[chef.git] / cookbooks / mediawiki / resources / site.rb

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 7f362cd8879e69a60f631ef8fc75c8e5b14e1af8..0781de597c0ac43a49ce037168616c9fabe2453c 100644 (file)
--- 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,
@@ -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
@@ -473,11 +472,8 @@ action :create do
     backup false
   end
 
-  ports = new_resource.ssl_enabled ? [80, 443] : [80]
-
   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
@@ -485,9 +481,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,
-              :ports => ports
+              :private => new_resource.private
     reload_apache false
   end
 
@@ -576,7 +570,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