Set force_ssl for piwik

[chef.git] / cookbooks / wiki / recipes / default.rb

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 96cbacaa980fd8254274ede9ac15b47f19b1ed15..a5b5a80982a73166f16a9b94fffd2cab99ceb5c9 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -23,6 +23,8 @@ include_recipe "mediawiki"
 
 passwords = data_bag_item("wiki", "passwords")
 
 
 passwords = data_bag_item("wiki", "passwords")
 

+package "lua5.1" # newer versions do not work with Scribuntu!
+

 apache_site "default" do
   action [:disable]
 end
 apache_site "default" do
   action [:disable]
 end


@@ -59,8 +61,14 @@ mediawiki_extension "MobileFrontend" do
   template "mw-ext-MobileFrontend.inc.php.erb"
 end
 
   template "mw-ext-MobileFrontend.inc.php.erb"
 end
 

+mediawiki_extension "CodeEditor" do
+  site "wiki.openstreetmap.org"
+end
+

 mediawiki_extension "Scribunto" do
   site "wiki.openstreetmap.org"
 mediawiki_extension "Scribunto" do
   site "wiki.openstreetmap.org"

+  template "mw-ext-Scribunto.inc.php.erb"
+  template_cookbook "wiki"

 end
 
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
 end
 
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do