Update wiki to mediawiki 1.28

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

diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index e78ca3a25859b362f6744e1233aaf2d9569720a6..24b53c8faed420473759fb3b2ef0f9b46f45566f 100644 (file)
--- a/cookbooks/mediawiki/providers/site.rb
+++ b/cookbooks/mediawiki/providers/site.rb
@@ -28,12 +28,12 @@ end
 use_inline_resources
 
 action :create do
 use_inline_resources
 
 action :create do

-  node.set_unless[:mediawiki][:sites][new_resource.name] = {}
+  node.normal_unless[:mediawiki][:sites][new_resource.name] = {}

 
 

-  node.set[:mediawiki][:sites][new_resource.name][:directory] = site_directory
-  node.set[:mediawiki][:sites][new_resource.name][:version] = new_resource.version
+  node.normal[:mediawiki][:sites][new_resource.name][:directory] = site_directory
+  node.normal[:mediawiki][:sites][new_resource.name][:version] = new_resource.version

 
 

-  node.set_unless[:mediawiki][:sites][new_resource.name][:wgSecretKey] = SecureRandom.base64(48)
+  node.normal_unless[:mediawiki][:sites][new_resource.name][:wgSecretKey] = SecureRandom.base64(48)

 
   mysql_user "#{new_resource.database_user}@localhost" do
     password new_resource.database_password
 
   mysql_user "#{new_resource.database_user}@localhost" do
     password new_resource.database_password


@@ -76,13 +76,13 @@ action :create do
   directory site_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
   directory site_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0775
+    mode 0o775

   end
 
   directory mediawiki_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
   end
 
   directory mediawiki_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0775
+    mode 0o775

   end
 
   mediawiki_reference = "REL#{new_resource.version}".tr(".", "_")
   end
 
   mediawiki_reference = "REL#{new_resource.version}".tr(".", "_")


@@ -121,19 +121,19 @@ action :create do
   directory "#{mediawiki_directory}/images" do
     owner "www-data"
     group node[:mediawiki][:group]
   directory "#{mediawiki_directory}/images" do
     owner "www-data"
     group node[:mediawiki][:group]

-    mode 0775
+    mode 0o775

   end
 
   directory "#{mediawiki_directory}/cache" do
     owner "www-data"
     group node[:mediawiki][:group]
   end
 
   directory "#{mediawiki_directory}/cache" do
     owner "www-data"
     group node[:mediawiki][:group]

-    mode 0775
+    mode 0o775

   end
 
   directory "#{mediawiki_directory}/LocalSettings.d" do
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
   end
 
   directory "#{mediawiki_directory}/LocalSettings.d" do
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0775
+    mode 0o775

   end
 
   template "#{mediawiki_directory}/LocalSettings.php" do
   end
 
   template "#{mediawiki_directory}/LocalSettings.php" do


@@ -141,7 +141,7 @@ action :create do
     source "LocalSettings.php.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
     source "LocalSettings.php.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0664
+    mode 0o664

     variables :name => new_resource.name,
               :directory => mediawiki_directory,
               :database_params => new_resource.database_params,
     variables :name => new_resource.name,
               :directory => mediawiki_directory,
               :database_params => new_resource.database_params,


@@ -154,7 +154,7 @@ action :create do
     source "mediawiki.cron.erb"
     owner "root"
     group "root"
     source "mediawiki.cron.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :name => new_resource.name, :directory => site_directory,
               :user => node[:mediawiki][:user]
   end
     variables :name => new_resource.name, :directory => site_directory,
               :user => node[:mediawiki][:user]
   end


@@ -164,7 +164,7 @@ action :create do
     source "mediawiki-backup.cron.erb"
     owner "root"
     group "root"
     source "mediawiki-backup.cron.erb"
     owner "root"
     group "root"

-    mode 0700
+    mode 0o700

     variables :name => new_resource.name, :directory => site_directory,
               :database_params => new_resource.database_params
   end
     variables :name => new_resource.name, :directory => site_directory,
               :database_params => new_resource.database_params
   end


@@ -292,12 +292,13 @@ action :create do
 
   # MediaWiki Language Extension Bundle
   # FIXME: should automatically resolve tag
 
   # MediaWiki Language Extension Bundle
   # FIXME: should automatically resolve tag

-  mw_lang_ext_bundle_tag = "2015.10"
+  mw_lang_ext_bundle_tag = "2016.10"

 
   mediawiki_extension "Babel" do
     site new_resource.name
     template "mw-ext-Babel.inc.php.erb"
 
   mediawiki_extension "Babel" do
     site new_resource.name
     template "mw-ext-Babel.inc.php.erb"

-    tag mw_lang_ext_bundle_tag
+    # tag mw_lang_ext_bundle_tag
+    reference "740782459d34e756a932ea1ceddde432a1295197"

     update_site false
   end
 
     update_site false
   end
 


@@ -431,7 +432,7 @@ action :create do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0644
+    mode 0o644

     backup false
   end
 
     backup false
   end
 


@@ -439,7 +440,7 @@ action :create do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0644
+    mode 0o644

     backup false
   end
 
     backup false
   end
 


@@ -447,21 +448,25 @@ action :create do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0644
+    mode 0o644

     backup false
   end
 
   ports = new_resource.ssl_enabled ? [80, 443] : [80]
 
     backup false
   end
 
   ports = new_resource.ssl_enabled ? [80, 443] : [80]
 

+  ssl_certificate new_resource.name do
+    domains [new_resource.name] + Array(new_resource.aliases)
+    only_if { new_resource.ssl_enabled }
+  end
+

   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,

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

     reload_apache false
   end
 
     reload_apache false
   end
 


@@ -483,7 +488,7 @@ action :update do
     source "LocalSettings.php.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
     source "LocalSettings.php.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0664
+    mode 0o664

     variables :name => new_resource.name,
               :directory => mediawiki_directory,
               :database_params => new_resource.database_params,
     variables :name => new_resource.name,
               :directory => mediawiki_directory,
               :database_params => new_resource.database_params,