X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/29915ddbd1d3c94d5bde9a43af009606f1294ceb..a4d04a4891133e5b8e623c316dc2147f1b333ae9:/cookbooks/mediawiki/providers/site.rb

diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index f175dbd5c..c17f871ca 100644
--- a/cookbooks/mediawiki/providers/site.rb
+++ b/cookbooks/mediawiki/providers/site.rb
@@ -87,11 +87,10 @@ action :create do
 
   mediawiki_reference = "REL#{new_resource.version}".tr(".", "_")
 
-  git site_directory do
+  git mediawiki_directory do
     action :sync
-    repository "git://github.com/wikimedia/mediawiki-core"
-    reference mediawiki_reference
-    # depth 1
+    repository "git://github.com/wikimedia/mediawiki"
+    revision mediawiki_reference
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
     notifies :run, "execute[#{mediawiki_directory}/maintenance/install.php]", :immediately
@@ -161,6 +160,26 @@ action :create do
               :database_params => new_resource.database_params
   end
 
+  mediawiki_skin "CologneBlue" do # ~FC005
+    site new_resource.name
+    update_site false
+  end
+
+  mediawiki_skin "Modern" do
+    site new_resource.name
+    update_site false
+  end
+
+  mediawiki_skin "MonoBook" do
+    site new_resource.name
+    update_site false
+  end
+
+  mediawiki_skin "Vector" do
+    site new_resource.name
+    update_site false
+  end
+
   mediawiki_extension "Cite" do
     site new_resource.name
     template "mw-ext-Cite.inc.php.erb"
@@ -381,13 +400,15 @@ action :create do
     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,
-              :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
@@ -403,6 +424,31 @@ action :create do
   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