Switch culebre, fafnir, ladon and trogdor to squid 4

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index dfe7a966f4de03237332069ad1835da61c898344..47625ae0d5935241c4baa9d7c60409bd57029f83 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: wiki.openstreetmap.org
+# Cookbook:: wiki.openstreetmap.org

 # Recipe:: default
 #
 # Recipe:: default
 #

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

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

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -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


@@ -33,8 +35,6 @@ mediawiki_site "wiki.openstreetmap.org" do
            "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"]
   directory "/srv/wiki.openstreetmap.org"
 
            "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"]
   directory "/srv/wiki.openstreetmap.org"
 

-  ssl_enabled TRUE
-

   database_name "wiki"
   database_user "wiki-user"
   database_password passwords["database"]
   database_name "wiki"
   database_user "wiki-user"
   database_password passwords["database"]


@@ -47,7 +47,7 @@ mediawiki_site "wiki.openstreetmap.org" do
   email_sender "wiki@noreply.openstreetmap.org"
   email_sender_name "OpenStreetMap Wiki"
 
   email_sender "wiki@noreply.openstreetmap.org"
   email_sender_name "OpenStreetMap Wiki"
 

-  metanamespace "OpenStreetMap"
+  metanamespace "Wiki"

 
   recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz"
   recaptcha_private_key passwords["recaptcha"]
 
   recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz"
   recaptcha_private_key passwords["recaptcha"]


@@ -56,6 +56,55 @@ mediawiki_site "wiki.openstreetmap.org" do
   # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."
 end
 
   # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."
 end
 

+mediawiki_extension "CodeEditor" do
+  site "wiki.openstreetmap.org"
+end
+
+mediawiki_extension "CodeMirror" do
+  site "wiki.openstreetmap.org"
+end
+
+mediawiki_extension "Scribunto" do
+  site "wiki.openstreetmap.org"
+  template "mw-ext-Scribunto.inc.php.erb"
+  template_cookbook "wiki"
+end
+
+mediawiki_extension "Wikibase" do
+  site "wiki.openstreetmap.org"
+  template "mw-ext-Wikibase.inc.php.erb"
+  template_cookbook "wiki"
+end
+
+mediawiki_extension "OsmWikibase" do
+  site "wiki.openstreetmap.org"
+  repository "git://github.com/nyurik/OsmWikibase.git"
+  reference "master"
+end
+
+mediawiki_extension "Echo" do
+  site "wiki.openstreetmap.org"
+  template "mw-ext-Echo.inc.php.erb"
+  template_cookbook "wiki"
+end
+
+mediawiki_extension "Thanks" do
+  site "wiki.openstreetmap.org"
+  template "mw-ext-Thanks.inc.php.erb"
+  template_cookbook "wiki"
+end
+
+mediawiki_extension "TimedMediaHandler" do
+  site "wiki.openstreetmap.org"
+end
+
+mediawiki_extension "MultiMaps" do
+  site "wiki.openstreetmap.org"
+  template "mw-ext-MultiMaps.inc.php.erb"
+  template_cookbook "wiki"
+  variables :thunderforest_key => passwords["thunderforest"]
+end
+

 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]


@@ -75,21 +124,16 @@ cookbook_file "/srv/wiki.openstreetmap.org/favicon.ico" do
   mode 0o644
 end
 
   mode 0o644
 end
 

-directory "/srv/dump.wiki.openstreetmap.org" do
+directory "/srv/wiki.openstreetmap.org/dump" do

   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
   mode "0775"
 end
 
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
   mode "0775"
 end
 

-apache_site "dump.wiki.openstreetmap.org" do
-  template "apache_wiki_dump.erb"
-  directory "/srv/dump.wiki.openstreetmap.org"
-  variables :aliases => "dump.wiki.osm.org"
-end
-
-template "/etc/cron.d/wiki-osm-org-dump" do
+template "/etc/cron.d/wiki-dump" do

   owner "root"
   group "root"
   mode 0o644
   owner "root"
   group "root"
   mode 0o644

-  source "cron_wiki_dump.erb"
+  source "wiki-dump.erb"
+  variables :directory => "/srv/wiki.openstreetmap.org"

 end
 end