Update CiviCRM to 4.6.26

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

diff --git a/cookbooks/mediawiki/providers/extension.rb b/cookbooks/mediawiki/providers/extension.rb
index 4a8943941adc65bdd0a17674dbabb3c4c9de691d..e0eefa24509b1da49a1a9145d4e3cfad3ffbbe0c 100644 (file)
--- 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]
       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
     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/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


@@ -55,25 +57,25 @@ action :create do
   end
 
   if new_resource.template # ~FC023
   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]
       group node[:mediawiki][:group]
       cookbook "mediawiki"
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]

-      mode 0664
+      mode 0o664

       variables new_resource.variables
     end
       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 0o664
+      only_if { ::File.exist?(extension_script) }
+    end

   end
 end
 
   end
 end
 


@@ -83,13 +85,7 @@ action :delete do
     recursive true
   end
 
     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
     action :delete
   end
 end


@@ -100,8 +96,12 @@ def site_directory
   node[:mediawiki][:sites][new_resource.site][:directory]
 end
 
   node[:mediawiki][:sites][new_resource.site][:directory]
 end
 

+def mediawiki_directory
+  "#{site_directory}/w"
+end
+

 def extension_directory
 def extension_directory

-  "#{site_directory}/extensions/#{new_resource.name}"
+  "#{mediawiki_directory}/extensions/#{new_resource.name}"

 end
 
 def extension_version
 end
 
 def extension_version