X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a1780627367305e7bd8987ad71fec090cda8743f..e0288536f101ddeef1bb700fa26388a5a6b30608:/cookbooks/wiki/recipes/default.rb diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index 5e15212e0..f1317ad54 100644 --- 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 @@ -58,11 +56,6 @@ 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 - site "wiki.openstreetmap.org" - template "mw-ext-MobileFrontend.inc.php.erb" -end - mediawiki_extension "CodeEditor" do site "wiki.openstreetmap.org" end @@ -117,16 +110,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