Switch main web site to letsencrypt

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

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 9033f98f53f2e96b81b708dcbdb3535f1e92cd69..83df8a4cb9d0e8566259f30fe55bfb5a1458430d 100644 (file)
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -22,13 +22,15 @@ include_recipe "mediawiki"
 passwords = data_bag_item("foundation", "passwords")
 
 mediawiki_site "wiki.osmfoundation.org" do
 passwords = data_bag_item("foundation", "passwords")
 
 mediawiki_site "wiki.osmfoundation.org" do

-  aliases "www.osmfoundation.org", "osmfoundation.org"
+  aliases ["www.osmfoundation.org", "osmfoundation.org",
+           "foundation.openstreetmap.org", "foundation.osm.org"]

   sitename "OpenStreetMap Foundation Wiki"
   directory "/srv/wiki.osmfoundation.org"
   sitename "OpenStreetMap Foundation Wiki"
   directory "/srv/wiki.osmfoundation.org"

-  enable_ssl true
+  ssl_enabled true

   database_name "osmf-wiki"
   database_name "osmf-wiki"

-  database_username "osmf-wikiuser"
+  database_user "osmf-wikiuser"

   database_password passwords["wiki"]["database"]
   database_password passwords["wiki"]["database"]

+  admin_password passwords["wiki"]["admin"]

   skin "osmf"
   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"
   skin "osmf"
   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"


@@ -37,34 +39,18 @@ mediawiki_site "wiki.osmfoundation.org" do
   private_accounts true
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["wiki"]["recaptcha"]
   private_accounts true
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["wiki"]["recaptcha"]

+  extra_file_extensions ["mp3"]
+  version "1.28"

 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]
+mediawiki_skin "osmf" do
+  site "wiki.osmfoundation.org"
+  repository "git://github.com/openstreetmap/mediawiki-skins-osmf.git"
+  revision "master"

 end
 
 end
 

-link "/srv/wiki.osmfoundation.org/w/skins/osmf" do
-  to "osmf-skin/osmf"
-  owner node[:mediawiki][:user]
-  group node[:mediawiki][:group]
-end
-
-link "/srv/wiki.osmfoundation.org/w/skins/osmf.deps.php" do
-  to "osmf-skin/osmf.deps.php"
-  owner node[:mediawiki][:user]
-  group node[:mediawiki][:group]
-end
-
-link "/srv/wiki.osmfoundation.org/w/skins/osmf.php" do
-  to "osmf-skin/osmf.php"
+cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do

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

+  mode 0o644

 end
 end