X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/79f4a86c6a7320bb287968a42393b9449196b12e..0b7249f74cb1ab458840149506d474415335650e:/cookbooks/wiki/recipes/default.rb diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index b82f59058..58836b54f 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.rb @@ -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