Require postgres 9.3 on poldi and pummelzacken

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

diff --git a/cookbooks/mediawiki/providers/extension.rb b/cookbooks/mediawiki/providers/extension.rb
index 71a9633a81ee8841ed221f5ca8a4db2183c3a4b2..33f7ad221f06b9f8b35456d074a34c89f289f025 100644 (file)
--- a/cookbooks/mediawiki/providers/extension.rb
+++ b/cookbooks/mediawiki/providers/extension.rb
@@ -40,7 +40,7 @@ action :create do
     extension_reference = if new_resource.tag
                             "refs/tags/#{new_resource.tag}"
                           else
     extension_reference = if new_resource.tag
                             "refs/tags/#{new_resource.tag}"
                           else

-                            "refs/heads/REL#{extension_version}".tr(".", "_")
+                            "REL#{extension_version}".tr(".", "_")

                           end
 
     git extension_directory do
                           end
 
     git extension_directory do


@@ -68,7 +68,7 @@ action :create do
 
     file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
       action :create
 
     file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
       action :create

-      content "<?php require_once('#{extension_script}');\n"
+      content "<?php wfLoadExtension( '#{new_resource.name}' );\n"

       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       mode 0664
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       mode 0664