Add some more aliases for the OSMF wiki

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

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 37bb45bf7583a179aa20e1cbd47b42247d09d556..4385bb607657ff9957655436e2536f378774329d 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"
   ssl_enabled true
   database_name "osmf-wiki"
   database_user "osmf-wikiuser"
   database_password passwords["wiki"]["database"]
   sitename "OpenStreetMap Foundation Wiki"
   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"
   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"
   skin "osmf"
   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"


@@ -39,32 +41,14 @@ mediawiki_site "wiki.osmfoundation.org" do
   recaptcha_private_key passwords["wiki"]["recaptcha"]
 end
 
   recaptcha_private_key passwords["wiki"]["recaptcha"]
 end
 

-cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
-  owner node[:mediawiki][:user]
-  group node[:mediawiki][:group]
-  mode 0644
+mediawiki_skin "osmf" do
+  site "wiki.osmfoundation.org"
+  repository "git://github.com/openstreetmap/mediawiki-skins-osmf.git"
+  revision "master"

 end
 
 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]
-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 0644

 end
 end