Convert more URLs to https

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index dc95c21947cb56184bbc2851593d290a7bcb9c1e..35744d7c88ecd27a499fd699d251ba1afb8d37a6 100644 (file)
--- 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
 #
 # 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,


@@ -17,60 +17,62 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-#include_recipe "squid"
+# include_recipe "squid"

 
 include_recipe "mediawiki"
 
 passwords = data_bag_item("wiki", "passwords")
 
 apache_site "default" do
 
 include_recipe "mediawiki"
 
 passwords = data_bag_item("wiki", "passwords")
 
 apache_site "default" do

-  action [ :disable ]
+  action [:disable]

 end
 
 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"
-  directory     "/srv/wiki.openstreetmap.org"
+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"]
+  directory "/srv/wiki.openstreetmap.org"
+
+  ssl_enabled TRUE

 
 

-  enable_ssl    TRUE
-  

   database_name "wiki"
   database_name "wiki"

-  database_username "wiki-user"
+  database_user "wiki-user"

   database_password passwords["database"]
 
   admin_password passwords["admin"]
 
   database_password passwords["database"]
 
   admin_password passwords["admin"]
 

-  logo          "/osm_logo_wiki.png"
+  logo "/osm_logo_wiki.png"

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

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

   email_sender_name "OpenStreetMap Wiki"
 
   metanamespace "OpenStreetMap"
 
   email_sender_name "OpenStreetMap Wiki"
 
   metanamespace "OpenStreetMap"
 

-  recaptcha_public_key "6Lc9OLsSAAAAAKazGuA9zItboXIHb6ObYOdiVm6o"
+  recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz"

   recaptcha_private_key passwords["recaptcha"]
   recaptcha_private_key passwords["recaptcha"]

-  
-  #site_readonly "MAINTENANCE UPDATE: WIKI READ-ONLY. ETA: Tuesday 8: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
 
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
 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]
 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]
   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
 end
 
 directory "/srv/dump.wiki.openstreetmap.org" do


@@ -80,17 +82,14 @@ directory "/srv/dump.wiki.openstreetmap.org" do
 end
 
 apache_site "dump.wiki.openstreetmap.org" do
 end
 
 apache_site "dump.wiki.openstreetmap.org" do

-  template  "apache_wiki_dump.erb"
+  template "apache_wiki_dump.erb"

   directory "/srv/dump.wiki.openstreetmap.org"
   directory "/srv/dump.wiki.openstreetmap.org"

-  variables({
-    :aliases => "dump.wiki.osm.org"
-  })
+  variables :aliases => "dump.wiki.osm.org"

 end
 
 template "/etc/cron.d/wiki-osm-org-dump" do
   owner "root"
   group "root"
 end
 
 template "/etc/cron.d/wiki-osm-org-dump" do
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   source "cron_wiki_dump.erb"
 end
   source "cron_wiki_dump.erb"
 end

-