X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/5038552aa329db50d1710c9fb500217c640b287f..db8d46b7feeaefdb105dd0ed9c6d0d0084250b92:/cookbooks/wiki/recipes/default.rb diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index 3547a8f19..55eebc2a4 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.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 # -# 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, @@ -33,8 +33,6 @@ mediawiki_site "wiki.openstreetmap.org" do "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"] directory "/srv/wiki.openstreetmap.org" - ssl_enabled TRUE - database_name "wiki" database_user "wiki-user" database_password passwords["database"] @@ -44,7 +42,7 @@ mediawiki_site "wiki.openstreetmap.org" do logo "/osm_logo_wiki.png" email_contact "webmaster@openstreetmap.org" - email_sender "wiki@openstreetmap.org" + email_sender "wiki@noreply.openstreetmap.org" email_sender_name "OpenStreetMap Wiki" metanamespace "OpenStreetMap" @@ -52,27 +50,32 @@ mediawiki_site "wiki.openstreetmap.org" do recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz" recaptcha_private_key passwords["recaptcha"] - site_notice "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT." - site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT." + # site_notice "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT." + # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT." +end + +mediawiki_extension "MobileFrontend" do + site "wiki.openstreetmap.org" + template "mw-ext-MobileFrontend.inc.php.erb" end cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0644 + mode 0o644 end template "/srv/wiki.openstreetmap.org/robots.txt" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0644 + mode 0o644 source "robots.txt.erb" end cookbook_file "/srv/wiki.openstreetmap.org/favicon.ico" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0644 + mode 0o644 end directory "/srv/dump.wiki.openstreetmap.org" do @@ -90,6 +93,6 @@ end template "/etc/cron.d/wiki-osm-org-dump" do owner "root" group "root" - mode 0644 + mode 0o644 source "cron_wiki_dump.erb" end