X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b4f387dd6b51418fc830b25acfafceb7e75fe1d0..d5a85e00136bfbedcd488bbe9c93f5752bf1a106:/cookbooks/mediawiki/providers/extension.rb

diff --git a/cookbooks/mediawiki/providers/extension.rb b/cookbooks/mediawiki/providers/extension.rb
index 4a8943941..33f7ad221 100644
--- 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
-                            "refs/heads/REL#{extension_version}".tr(".", "_")
+                            "REL#{extension_version}".tr(".", "_")
                           end
 
     git extension_directory do
@@ -55,7 +55,7 @@ action :create do
   end
 
   if new_resource.template # ~FC023
-    template "#{site_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
+    template "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
       cookbook "mediawiki"
       source new_resource.template
       user node[:mediawiki][:user]
@@ -63,17 +63,17 @@ action :create do
       mode 0664
       variables new_resource.variables
     end
-  end
-
-  extension_script = "#{extension_directory}/#{new_resource.name}.php"
+  else
+    extension_script = "#{extension_directory}/#{new_resource.name}.php"
 
-  file "#{site_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
-    action :create
-    content "<?php require_once('#{extension_script}');\n"
-    user node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-    mode 0664
-    only_if { ::File.exist?(extension_script) }
+    file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
+      action :create
+      content "<?php wfLoadExtension( '#{new_resource.name}' );\n"
+      user node[:mediawiki][:user]
+      group node[:mediawiki][:group]
+      mode 0664
+      only_if { ::File.exist?(extension_script) }
+    end
   end
 end
 
@@ -83,13 +83,7 @@ action :delete do
     recursive true
   end
 
-  if new_resource.template # ~FC023
-    file "#{site_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
-      action :delete
-    end
-  end
-
-  file "#{site_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
+  file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
     action :delete
   end
 end
@@ -100,8 +94,12 @@ def site_directory
   node[:mediawiki][:sites][new_resource.site][:directory]
 end
 
+def mediawiki_directory
+  "#{site_directory}/w"
+end
+
 def extension_directory
-  "#{site_directory}/extensions/#{new_resource.name}"
+  "#{mediawiki_directory}/extensions/#{new_resource.name}"
 end
 
 def extension_version