Install gnupg for apt signature verification

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 350c5a1bac67a131c0ce7e0d7259b6f8b8420a47..f1317ad54e57fe6943006fb3873e774bc03fb8f3 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -56,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
@@ -84,13 +79,16 @@ mediawiki_extension "OsmWikibase" do
   reference "master"
 end
 
-mediawiki_extension "Maps" do
+mediawiki_extension "Echo" do
   site "wiki.openstreetmap.org"
-  repository "git://github.com/JeroenDeDauw/Maps.git"
-  tag "6.0.3"
-  template "mw-ext-Maps.inc.php.erb"
+  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"
-  variables :thunderforest_key => passwords["thunderforest"]
 end
 
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
@@ -112,21 +110,16 @@ cookbook_file "/srv/wiki.openstreetmap.org/favicon.ico" do
   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
 
-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
-  source "cron_wiki_dump.erb"
+  source "wiki-dump.erb"
+  variables :directory => "/srv/wiki.openstreetmap.org"
 end