Add monitoring for some EC2 metrics

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index b82f590580b4ad3e0f56c12386da16ef698dcd54..b93092031fae3683fc1c424d62f00e9f190e7fa4 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -30,8 +30,8 @@ end
 mediawiki_site "wiki.openstreetmap.org" do
   aliases ["wiki.osm.org", "wiki.openstreetmap.com", "wiki.openstreetmap.net",
            "wiki.openstreetmap.ca", "wiki.openstreetmap.eu",
-           "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"]
-  directory "/srv/wiki.openstreetmap.org"
+           "wiki.openstreetmap.pro", "wiki.openstreetmaps.org",
+           "osm.wiki", "www.osm.wiki", "wiki.osm.wiki"]
 
   fpm_max_children 50
   fpm_start_servers 10
@@ -107,6 +107,19 @@ mediawiki_extension "MultiMaps" do
   template "mw-ext-MultiMaps.inc.php.erb"
   template_cookbook "wiki"
   variables :thunderforest_key => passwords["thunderforest"]
+  action :delete
+end
+
+mediawiki_extension "JsonConfig" do
+  site "wiki.openstreetmap.org"
+  template "mw-ext-JsonConfig.inc.php.erb"
+  template_cookbook "wiki"
+end
+
+mediawiki_extension "Kartographer" do
+  site "wiki.openstreetmap.org"
+  template "mw-ext-Kartographer.inc.php.erb"
+  template_cookbook "wiki"
 end
 
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
@@ -151,10 +164,6 @@ systemd_timer "wiki-dump" do
   on_calendar "02:00"
 end
 
-cron_d "wiki-dump" do
-  action :delete
-end
-
 service "wiki-dump.timer" do
   action [:enable, :start]
 end
@@ -164,8 +173,8 @@ systemd_service "wiki-rdf-dump" do
   type "oneshot"
   exec_start [
     "/usr/bin/php w/extensions/Wikibase/repo/maintenance/dumpRdf.php --wiki wiki --format ttl --flavor full-dump --entity-type item --entity-type property --no-cache --output /tmp/wikibase-rdf.ttl",
-    "/usr/bin/gzip -9 /tmp/wikibase-rdf.ttl",
-    "/usr/bin/mv /tmp/wikibase-rdf.ttl.gz /srv/wiki.openstreetmap.org/dump/wikibase-rdf.ttl.gz"
+    "/bin/gzip -9 /tmp/wikibase-rdf.ttl",
+    "/bin/mv /tmp/wikibase-rdf.ttl.gz /srv/wiki.openstreetmap.org/dump/wikibase-rdf.ttl.gz"
   ]
   working_directory "/srv/wiki.openstreetmap.org"
   user "wiki"
@@ -180,10 +189,6 @@ systemd_timer "wiki-rdf-dump" do
   on_calendar "04:00"
 end
 
-cron_d "wiki-rdf-dump" do
-  action :delete
-end
-
 service "wiki-rdf-dump.timer" do
   action [:enable, :start]
 end