X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ab3f99c2b3dcd13d2a45ff0cae211a8fbe1b1f21..77c76717bfc26fe7ba1641244164bc1cb5c38429:/cookbooks/mediawiki/providers/extension.rb

diff --git a/cookbooks/mediawiki/providers/extension.rb b/cookbooks/mediawiki/providers/extension.rb
index 71a9633a8..f32f581b4 100644
--- a/cookbooks/mediawiki/providers/extension.rb
+++ b/cookbooks/mediawiki/providers/extension.rb
@@ -30,17 +30,19 @@ action :create do
       source new_resource.source
       owner node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      mode 0755
+      mode 0o755
       files_owner node[:mediawiki][:user]
       files_group node[:mediawiki][:group]
-      files_mode 0755
+      files_mode 0o755
     end
   else
     extension_repository = new_resource.repository || default_repository
-    extension_reference = if new_resource.tag
+    extension_reference = if new_resource.reference
+                            new_resource.reference
+                          elsif new_resource.tag
                             "refs/tags/#{new_resource.tag}"
                           else
-                            "refs/heads/REL#{extension_version}".tr(".", "_")
+                            "REL#{extension_version}".tr(".", "_")
                           end
 
     git extension_directory do
@@ -60,18 +62,17 @@ action :create do
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      mode 0664
+      mode 0o664
       variables new_resource.variables
     end
   else
     extension_script = "#{extension_directory}/#{new_resource.name}.php"
 
     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
+      mode 0o664
       only_if { ::File.exist?(extension_script) }
     end
   end