Nominatim: search_country table got removed in April

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

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 2baa6c7f73247ec5417c3563c7dd768f91d51ec2..e13aaa186d6adc88d210baa2ff17168681b34f65 100644 (file)
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # 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,


@@ -26,12 +26,11 @@ mediawiki_site "wiki.osmfoundation.org" do
            "foundation.openstreetmap.org", "foundation.osm.org"]
   sitename "OpenStreetMap Foundation"
   directory "/srv/wiki.osmfoundation.org"
            "foundation.openstreetmap.org", "foundation.osm.org"]
   sitename "OpenStreetMap Foundation"
   directory "/srv/wiki.osmfoundation.org"

-  ssl_enabled true

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

-  skin "osmf"
+  skin "OSMFoundation"

   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"
   email_sender "webmaster@openstreetmap.org"
   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"
   email_sender "webmaster@openstreetmap.org"


@@ -42,12 +41,24 @@ mediawiki_site "wiki.osmfoundation.org" do
   extra_file_extensions ["mp3"]
 end
 
   extra_file_extensions ["mp3"]
 end
 

+mediawiki_extension "MobileFrontend" do
+  action :delete
+  site "wiki.osmfoundation.org"
+end
+

 mediawiki_skin "osmf" do
   site "wiki.osmfoundation.org"
   repository "git://github.com/openstreetmap/mediawiki-skins-osmf.git"
   revision "master"
 end
 
 mediawiki_skin "osmf" do
   site "wiki.osmfoundation.org"
   repository "git://github.com/openstreetmap/mediawiki-skins-osmf.git"
   revision "master"
 end
 

+mediawiki_skin "OSMFoundation" do
+  site "wiki.osmfoundation.org"
+  repository "git://github.com/osmfoundation/osmf-mediawiki-skin.git"
+  revision "master"
+  legacy false
+end
+

 cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
 cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]