Add tile HTTPS address to external image whitelist

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

diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb
index 47e807052c148966636ac17dd153232650e6ad0a..1803c04f0c1913d6b78cceec2304a4ff283fd5d8 100644 (file)
--- a/cookbooks/mediawiki/resources/extension.rb
+++ b/cookbooks/mediawiki/resources/extension.rb
@@ -23,6 +23,7 @@ property :extension, :kind_of => String, :name_attribute => true
 property :site, :kind_of => String, :required => true
 property :source, :kind_of => String
 property :template, :kind_of => String
+property :template_cookbook, :kind_of => String, :default => "mediawiki"
 property :variables, :kind_of => Hash, :default => {}
 property :version, :kind_of => String
 property :repository, :kind_of => String
@@ -66,7 +67,7 @@ action :create do
 
   if new_resource.template # ~FC023
     declare_resource :template, "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.extension}.inc.php" do
-      cookbook "mediawiki"
+      cookbook new_resource.template_cookbook
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
@@ -74,14 +75,11 @@ action :create do
       variables new_resource.variables
     end
   else
-    extension_script = "#{extension_directory}/#{new_resource.extension}.php"
-
     file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.extension}.inc.php" do
       content "<?php wfLoadExtension( '#{new_resource.extension}' );\n"
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       mode 0o664
-      only_if { ::File.exist?(extension_script) }
     end
   end