nominatim: switch server to new location of nominatim

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

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index e508d39db9920d1891fc3a3caf8ea8cb9714c338..ddbe4705d6bee8b2118457fc936daa235b3cde9d 100644 (file)
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: foundation
+# Cookbook:: foundation

 # Recipe:: wiki
 #
 # Recipe:: wiki
 #

-# Copyright 2014, OpenStreetMap Foundation
+# Copyright:: 2014, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -21,50 +21,45 @@ include_recipe "mediawiki"
 
 passwords = data_bag_item("foundation", "passwords")
 
 
 passwords = data_bag_item("foundation", "passwords")
 

-mediawiki_site "wiki.osmfoundation.org" do
-  aliases ["www.osmfoundation.org", "osmfoundation.org"]
-  sitename "OpenStreetMap Foundation Wiki"
-  directory "/srv/wiki.osmfoundation.org"
-  ssl_enabled true
+mediawiki_site "osmfoundation.org" do
+  aliases ["wiki.osmfoundation.org", "www.osmfoundation.org",
+           "foundation.openstreetmap.org", "foundation.osm.org"]
+  sitename "OpenStreetMap Foundation"
+  fpm_max_children 20
+  fpm_start_servers 5
+  fpm_min_spare_servers 5
+  fpm_max_spare_servers 10
+  fpm_prometheus_port 11001

   database_name "osmf-wiki"
   database_user "osmf-wikiuser"
   database_password passwords["wiki"]["database"]
   database_name "osmf-wiki"
   database_user "osmf-wikiuser"
   database_password passwords["wiki"]["database"]

-  skin "osmf"
-  logo "/Wiki.png"
+  admin_password passwords["wiki"]["admin"]
+  skin "OSMFoundation"
+  logo "/w/skins/OSMFoundation/img/logo.png"

   email_contact "webmaster@openstreetmap.org"
   email_contact "webmaster@openstreetmap.org"

-  email_sender "webmaster@openstreetmap.org"
+  email_sender "wiki@noreply.openstreetmap.org"

   email_sender_name "OSMF Wiki"
   private_accounts true
   email_sender_name "OSMF Wiki"
   private_accounts true

-  recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
-  recaptcha_private_key passwords["wiki"]["recaptcha"]
+  extra_file_extensions %w[mp3 pptx]
+  version "1.39"

 end
 
 end
 

-cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
-  owner node[:mediawiki][:user]
-  group node[:mediawiki][:group]
-  mode 0644
-end
-
-subversion "/srv/wiki.osmfoundation.org/w/skins/osmf-skin" do
-  repository "http://svn.openstreetmap.org/extensions/mediawiki/osmf"
-  user node[:mediawiki][:user]
-  group node[:mediawiki][:group]
-end
-
-link "/srv/wiki.osmfoundation.org/w/skins/osmf" do
-  to "osmf-skin/osmf"
-  owner node[:mediawiki][:user]
-  group node[:mediawiki][:group]
+mediawiki_skin "OSMFoundation" do
+  site "osmfoundation.org"
+  repository "https://github.com/osmfoundation/osmf-mediawiki-skin.git"
+  revision "master"
+  legacy false

 end
 
 end
 

-link "/srv/wiki.osmfoundation.org/w/skins/osmf.deps.php" do
-  to "osmf-skin/osmf.deps.php"
+cookbook_file "/srv/osmfoundation.org/Wiki.png" do

   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]

+  mode "644"

 end
 
 end
 

-link "/srv/wiki.osmfoundation.org/w/skins/osmf.php" do
-  to "osmf-skin/osmf.php"
+template "/srv/osmfoundation.org/robots.txt" do

   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]

+  mode "644"
+  source "robots.txt.erb"

 end
 end