add city of melbourne imagery

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index b93092031fae3683fc1c424d62f00e9f190e7fa4..74e96d2cce223a2a3ed5e02986bc2eb69d257e11 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -28,15 +28,13 @@ apache_site "default" do
 end
 
 mediawiki_site "wiki.openstreetmap.org" do
 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",
+  aliases ["wiki.osm.org", "wiki.openstreetmap.com", "wiki.openstreetmaps.org",

            "osm.wiki", "www.osm.wiki", "wiki.osm.wiki"]
 
            "osm.wiki", "www.osm.wiki", "wiki.osm.wiki"]
 

-  fpm_max_children 50
-  fpm_start_servers 10
-  fpm_min_spare_servers 10
-  fpm_max_spare_servers 20
+  fpm_max_children 200
+  fpm_start_servers 25
+  fpm_min_spare_servers 25
+  fpm_max_spare_servers 50

   fpm_prometheus_port 9253
 
   database_name "wiki"
   fpm_prometheus_port 9253
 
   database_name "wiki"


@@ -153,6 +151,7 @@ systemd_service "wiki-dump" do
   exec_start "/usr/bin/php w/maintenance/dumpBackup.php --full --quiet --output=gzip:dump/dump.xml.gz"
   working_directory "/srv/wiki.openstreetmap.org"
   user "wiki"
   exec_start "/usr/bin/php w/maintenance/dumpBackup.php --full --quiet --output=gzip:dump/dump.xml.gz"
   working_directory "/srv/wiki.openstreetmap.org"
   user "wiki"

+  nice 19

   sandbox :enable_network => true
   memory_deny_write_execute false
   restrict_address_families "AF_UNIX"
   sandbox :enable_network => true
   memory_deny_write_execute false
   restrict_address_families "AF_UNIX"


@@ -161,7 +160,7 @@ end
 
 systemd_timer "wiki-dump" do
   description "Wiki dump"
 
 systemd_timer "wiki-dump" do
   description "Wiki dump"

-  on_calendar "02:00"
+  on_calendar "Sun 02:30"

 end
 
 service "wiki-dump.timer" do
 end
 
 service "wiki-dump.timer" do