Enable regular dumps of the main wiki

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 782fbdd3afb1ae7b85440ec0c02f3e19109600ef..5e15212e0410c1010780c2627dab840442a5aecc 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")
 

+dump_directory = "/srv/wiki.openstreetmap.org/dump"
+

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


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

-directory "/srv/dump.wiki.openstreetmap.org" do
+directory dump_directory 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
   owner "root"
   group "root"
   mode 0o644
   source "cron_wiki_dump.erb"
 template "/etc/cron.d/wiki-osm-org-dump" do
   owner "root"
   group "root"
   mode 0o644
   source "cron_wiki_dump.erb"

+  variables :dumppath => dump_directory

 end
 end