From: Tom Hughes <tom@compton.nu>
Date: Sun, 29 Mar 2015 13:49:56 +0000 (+0100)
Subject: Only use default mediawiki extension config if there is custom one
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/ab3f99c2b3dcd13d2a45ff0cae211a8fbe1b1f21

Only use default mediawiki extension config if there is custom one
---

diff --git a/cookbooks/mediawiki/providers/extension.rb b/cookbooks/mediawiki/providers/extension.rb
index 959940b93..71a9633a8 100644
--- a/cookbooks/mediawiki/providers/extension.rb
+++ b/cookbooks/mediawiki/providers/extension.rb
@@ -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 "#{mediawiki_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 require_once('#{extension_script}');\n"
+      user node[:mediawiki][:user]
+      group node[:mediawiki][:group]
+      mode 0664
+      only_if { ::File.exist?(extension_script) }
+    end
   end
 end
 
@@ -83,12 +83,6 @@ action :delete do
     recursive true
   end
 
-  if new_resource.template # ~FC023
-    file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
-      action :delete
-    end
-  end
-
   file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
     action :delete
   end