Install nodejs legacy symlink on 14.04

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

diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index 24a3ae984005eae83909971ec525c4ac110b9f7b..c17f871cac04ea5c5d7dc3600621a6ec05d8cb45 100644 (file)
--- a/cookbooks/mediawiki/providers/site.rb
+++ b/cookbooks/mediawiki/providers/site.rb
@@ -160,9 +160,9 @@ action :create do
               :database_params => new_resource.database_params
   end
 
               :database_params => new_resource.database_params
   end
 

-  mediawiki_skin "CologneBlue" do
+  mediawiki_skin "CologneBlue" do # ~FC005

     site new_resource.name
     site new_resource.name

-     update_site false
+    update_site false

   end
 
   mediawiki_skin "Modern" do
   end
 
   mediawiki_skin "Modern" do


@@ -400,13 +400,15 @@ action :create do
     backup false
   end
 
     backup false
   end
 

+  ports = new_resource.ssl_enabled ? [80, 443] : [80]
+

   apache_site new_resource.name do
     cookbook "mediawiki"
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),
               :private => new_resource.private,
   apache_site new_resource.name do
     cookbook "mediawiki"
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),
               :private => new_resource.private,

-              :ssl_enabled => new_resource.ssl_enabled,
+              :ports => ports,

               :ssl_certificate => new_resource.ssl_certificate,
               :ssl_certificate_chain => new_resource.ssl_certificate_chain
     reload_apache false
               :ssl_certificate => new_resource.ssl_certificate,
               :ssl_certificate_chain => new_resource.ssl_certificate_chain
     reload_apache false


@@ -422,6 +424,31 @@ action :create do
   end
 end
 
   end
 end
 

+action :update do
+  mediawiki_directory = "#{site_directory}/w"
+
+  template "#{mediawiki_directory}/LocalSettings.php" do
+    cookbook "mediawiki"
+    source "LocalSettings.php.erb"
+    owner node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    mode 0664
+    variables :name => new_resource.name,
+              :directory => mediawiki_directory,
+              :database_params => new_resource.database_params,
+              :mediawiki => new_resource.mediawiki_params
+    notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
+  end
+
+  execute "#{mediawiki_directory}/maintenance/update.php" do
+    action :run
+    command "php maintenance/update.php --quick"
+    cwd mediawiki_directory
+    user node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+  end
+end
+

 action :delete do
   apache_site new_resource.name do
     action :delete
 action :delete do
   apache_site new_resource.name do
     action :delete