Limit depth of worddpress extension checkout

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

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 8096299a673e86ed125f7c1c1ddf314ef871c9f7..323e33259e62e3d905368a5a6325032103b906ad 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: mediawiki
+# Cookbook:: mediawiki

 # Resource:: mediawiki_site
 #
 # Resource:: mediawiki_site
 #

-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -19,10 +19,10 @@
 
 default_action :create
 
 
 default_action :create
 

-property :site, :kind_of => String, :name_attribute => true
+property :site, :kind_of => String, :name_property => true

 property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String
 property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String

-property :version, :kind_of => String, :default => "1.31"
+property :version, :kind_of => String, :default => "1.33"

 property :database_name, :kind_of => String, :required => true
 property :database_user, :kind_of => String, :required => true
 property :database_password, :kind_of => String, :required => true
 property :database_name, :kind_of => String, :required => true
 property :database_user, :kind_of => String, :required => true
 property :database_password, :kind_of => String, :required => true


@@ -105,25 +105,34 @@ action :create do
 
   mediawiki_reference = "REL#{new_resource.version}".tr(".", "_")
 
 
   mediawiki_reference = "REL#{new_resource.version}".tr(".", "_")
 

-  git "#{mediawiki_directory}/vendor" do
-    action :nothing
-    repository "https://gerrit.wikimedia.org/r/p/mediawiki/vendor.git"
-    revision mediawiki_reference
-    user node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-  end
-

   git mediawiki_directory do
     action :sync
     repository "https://gerrit.wikimedia.org/r/p/mediawiki/core.git"
     revision mediawiki_reference
   git mediawiki_directory do
     action :sync
     repository "https://gerrit.wikimedia.org/r/p/mediawiki/core.git"
     revision mediawiki_reference

+    depth 1

     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    notifies :sync, "git[#{mediawiki_directory}/vendor]", :immediately
+    notifies :run, "execute[#{mediawiki_directory}/composer.json]", :immediately

     notifies :run, "execute[#{mediawiki_directory}/maintenance/install.php]", :immediately
     notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
   end
 
     notifies :run, "execute[#{mediawiki_directory}/maintenance/install.php]", :immediately
     notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
   end
 

+  execute "#{mediawiki_directory}/composer.json" do
+    action :nothing
+    command "composer update --no-dev"
+    cwd mediawiki_directory
+    user node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+  end
+
+  template "#{mediawiki_directory}/composer.local.json" do
+    cookbook "mediawiki"
+    source "composer.local.json.erb"
+    owner node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    mode 0o664
+  end
+

   # Safety catch if git doesn't update but install.php hasn't run
   ruby_block "catch-installer-localsettings-run" do
     action :run
   # Safety catch if git doesn't update but install.php hasn't run
   ruby_block "catch-installer-localsettings-run" do
     action :run


@@ -188,7 +197,7 @@ action :create do
   end
 
   # MobileFrontend extension is required by MinervaNeue skin
   end
 
   # MobileFrontend extension is required by MinervaNeue skin

-  mediawiki_extension "MobileFrontend" do # ~FC005
+  mediawiki_extension "MobileFrontend" do

     site new_resource.site
     template "mw-ext-MobileFrontend.inc.php.erb"
   end
     site new_resource.site
     template "mw-ext-MobileFrontend.inc.php.erb"
   end


@@ -197,26 +206,31 @@ action :create do
   mediawiki_skin "MinervaNeue" do
     site new_resource.site
     update_site false
   mediawiki_skin "MinervaNeue" do
     site new_resource.site
     update_site false

+    legacy false

   end
 
   mediawiki_skin "CologneBlue" do
     site new_resource.site
     update_site false
   end
 
   mediawiki_skin "CologneBlue" do
     site new_resource.site
     update_site false

+    legacy false

   end
 
   mediawiki_skin "Modern" do
     site new_resource.site
     update_site false
   end
 
   mediawiki_skin "Modern" do
     site new_resource.site
     update_site false

+    legacy false

   end
 
   mediawiki_skin "MonoBook" do
     site new_resource.site
     update_site false
   end
 
   mediawiki_skin "MonoBook" do
     site new_resource.site
     update_site false

+    legacy false

   end
 
   mediawiki_skin "Vector" do
     site new_resource.site
     update_site false
   end
 
   mediawiki_skin "Vector" do
     site new_resource.site
     update_site false

+    legacy false

   end
 
   mediawiki_extension "Cite" do
   end
 
   mediawiki_extension "Cite" do


@@ -262,6 +276,7 @@ action :create do
 
   mediawiki_extension "Interwiki" do
     site new_resource.site
 
   mediawiki_extension "Interwiki" do
     site new_resource.site

+    template "mw-ext-Interwiki.inc.php.erb"

     update_site false
   end
 
     update_site false
   end
 


@@ -370,14 +385,12 @@ action :create do
   mediawiki_extension "AntiSpoof" do
     site new_resource.site
     template "mw-ext-AntiSpoof.inc.php.erb"
   mediawiki_extension "AntiSpoof" do
     site new_resource.site
     template "mw-ext-AntiSpoof.inc.php.erb"

-    compose true

     update_site false
   end
 
   mediawiki_extension "AbuseFilter" do
     site new_resource.site
     template "mw-ext-AbuseFilter.inc.php.erb"
     update_site false
   end
 
   mediawiki_extension "AbuseFilter" do
     site new_resource.site
     template "mw-ext-AbuseFilter.inc.php.erb"

-    compose true

     update_site false
   end
 
     update_site false
   end
 


@@ -394,13 +407,11 @@ action :create do
 
   mediawiki_extension "Elastica" do
     site new_resource.site
 
   mediawiki_extension "Elastica" do
     site new_resource.site

-    compose true

     update_site false
   end
 
   mediawiki_extension "CirrusSearch" do
     site new_resource.site
     update_site false
   end
 
   mediawiki_extension "CirrusSearch" do
     site new_resource.site

-    compose true

     template "mw-ext-CirrusSearch.inc.php.erb"
     update_site false
   end
     template "mw-ext-CirrusSearch.inc.php.erb"
     update_site false
   end


@@ -408,7 +419,7 @@ action :create do
   mediawiki_extension "osmtaginfo" do
     site new_resource.site
     template "mw-ext-osmtaginfo.inc.php.erb"
   mediawiki_extension "osmtaginfo" do
     site new_resource.site
     template "mw-ext-osmtaginfo.inc.php.erb"

-    repository "git://github.com/Firefishy/osmtaginfo.git"
+    repository "https://github.com/Firefishy/osmtaginfo.git"

     tag "live"
     update_site false
   end
     tag "live"
     update_site false
   end


@@ -416,7 +427,7 @@ action :create do
   mediawiki_extension "SimpleMap" do
     site new_resource.site
     template "mw-ext-SimpleMap.inc.php.erb"
   mediawiki_extension "SimpleMap" do
     site new_resource.site
     template "mw-ext-SimpleMap.inc.php.erb"

-    repository "git://github.com/Firefishy/SimpleMap.git"
+    repository "https://github.com/Firefishy/SimpleMap.git"

     tag "live"
     update_site false
   end
     tag "live"
     update_site false
   end


@@ -424,7 +435,7 @@ action :create do
   mediawiki_extension "SlippyMap" do
     site new_resource.site
     template "mw-ext-SlippyMap.inc.php.erb"
   mediawiki_extension "SlippyMap" do
     site new_resource.site
     template "mw-ext-SlippyMap.inc.php.erb"

-    repository "git://github.com/Firefishy/SlippyMap.git"
+    repository "https://github.com/Firefishy/SlippyMap.git"

     tag "live"
     update_site false
   end
     tag "live"
     update_site false
   end