X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..680ff1ff298a48b923644ea32b3dea392fca299a:/cookbooks/mediawiki/providers/site.rb?ds=sidebyside

diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index a3278cc0d..24667e37d 100644
--- a/cookbooks/mediawiki/providers/site.rb
+++ b/cookbooks/mediawiki/providers/site.rb
@@ -28,12 +28,12 @@ end
 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
@@ -276,6 +276,7 @@ action :create do
 
   mediawiki_extension "SyntaxHighlight_GeSHi" do
     site new_resource.name
+    template "mw-ext-SyntaxHighlight.inc.php.erb"
     update_site false
   end
 
@@ -292,11 +293,12 @@ action :create do
 
   # MediaWiki Language Extension Bundle
   # FIXME: should automatically resolve tag
-  mw_lang_ext_bundle_tag = "2015.10"
+  mw_lang_ext_bundle_tag = "2017.01"
 
   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
     update_site false
   end
@@ -453,15 +455,19 @@ action :create do
 
   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,
-              :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