Make sure cgimap uses the writable database for updates

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 5e15212e0410c1010780c2627dab840442a5aecc..455d8ede13e738bfb69818fcca31f445297729d0 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -23,8 +23,6 @@ include_recipe "mediawiki"
 
 passwords = data_bag_item("wiki", "passwords")
 
-dump_directory = "/srv/wiki.openstreetmap.org/dump"
-
 package "lua5.1" # newer versions do not work with Scribuntu!
 
 apache_site "default" do
@@ -49,7 +47,7 @@ mediawiki_site "wiki.openstreetmap.org" do
   email_sender "wiki@noreply.openstreetmap.org"
   email_sender_name "OpenStreetMap Wiki"
 
-  metanamespace "OpenStreetMap"
+  metanamespace "Wiki"
 
   recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz"
   recaptcha_private_key passwords["recaptcha"]
@@ -58,12 +56,11 @@ mediawiki_site "wiki.openstreetmap.org" do
   # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."
 end
 
-mediawiki_extension "MobileFrontend" do
+mediawiki_extension "CodeEditor" do
   site "wiki.openstreetmap.org"
-  template "mw-ext-MobileFrontend.inc.php.erb"
 end
 
-mediawiki_extension "CodeEditor" do
+mediawiki_extension "CodeMirror" do
   site "wiki.openstreetmap.org"
 end
 
@@ -98,6 +95,10 @@ mediawiki_extension "Thanks" do
   template_cookbook "wiki"
 end
 
+mediawiki_extension "TimedMediaHandler" do
+  site "wiki.openstreetmap.org"
+end
+
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
@@ -117,16 +118,16 @@ cookbook_file "/srv/wiki.openstreetmap.org/favicon.ico" do
   mode 0o644
 end
 
-directory dump_directory do
+directory "/srv/wiki.openstreetmap.org/dump" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
   mode "0775"
 end
 
-template "/etc/cron.d/wiki-osm-org-dump" do
+template "/etc/cron.d/wiki-dump" do
   owner "root"
   group "root"
   mode 0o644
-  source "cron_wiki_dump.erb"
-  variables :dumppath => dump_directory
+  source "wiki-dump.erb"
+  variables :directory => "/srv/wiki.openstreetmap.org"
 end