X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/647c3003e35fe19d949e1d78c4bb6f2c526e6bad..66e3060c83b235c3942eab6cb162a6888bad8757:/cookbooks/foundation/recipes/wiki.rb diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb index bb86254f1..8fbbaf8c7 100644 --- a/cookbooks/foundation/recipes/wiki.rb +++ b/cookbooks/foundation/recipes/wiki.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: foundation +# Cookbook:: foundation # 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 # -# 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, @@ -26,12 +26,11 @@ mediawiki_site "wiki.osmfoundation.org" do "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"] - skin "osmf" + skin "OSMFoundation" logo "/Wiki.png" email_contact "webmaster@openstreetmap.org" email_sender "webmaster@openstreetmap.org" @@ -44,13 +43,13 @@ end mediawiki_skin "osmf" do site "wiki.osmfoundation.org" - repository "git://github.com/openstreetmap/mediawiki-skins-osmf.git" + repository "https://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" + repository "https://github.com/osmfoundation/osmf-mediawiki-skin.git" revision "master" legacy false end @@ -58,5 +57,5 @@ end cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0o644 + mode "644" end