Add cookbook for blogs.openstreetmap.org

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

diff --git a/cookbooks/mediawiki/providers/extension.rb b/cookbooks/mediawiki/providers/extension.rb
index 71a9633a81ee8841ed221f5ca8a4db2183c3a4b2..ca0b6706e0b2691bc2672b21899d3f58fa09637b 100644 (file)
--- a/cookbooks/mediawiki/providers/extension.rb
+++ b/cookbooks/mediawiki/providers/extension.rb
@@ -30,17 +30,17 @@ action :create do
       source new_resource.source
       owner node[:mediawiki][:user]
       group node[:mediawiki][:group]
       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_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
                             "refs/tags/#{new_resource.tag}"
                           else
     end
   else
     extension_repository = new_resource.repository || default_repository
     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


@@ -60,7 +60,7 @@ action :create do
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]

-      mode 0664
+      mode 0o664

       variables new_resource.variables
     end
   else
       variables new_resource.variables
     end
   else


@@ -68,10 +68,10 @@ 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]
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]

-      mode 0664
+      mode 0o664

       only_if { ::File.exist?(extension_script) }
     end
   end
       only_if { ::File.exist?(extension_script) }
     end
   end