From: Tom Hughes <tom@compton.nu>
Date: Sun, 14 Dec 2014 19:37:02 +0000 (+0000)
Subject: Move wiki admin password to wiki cookbook
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/be9aeb731767735592361597ecfc1a4815f2b6c6

Move wiki admin password to wiki cookbook
---

diff --git a/cookbooks/mediawiki/definitions/mediawiki_site.rb b/cookbooks/mediawiki/definitions/mediawiki_site.rb
index d6a1ab773..e74c3ca26 100644
--- a/cookbooks/mediawiki/definitions/mediawiki_site.rb
+++ b/cookbooks/mediawiki/definitions/mediawiki_site.rb
@@ -38,8 +38,6 @@ define :mediawiki_site, :action => [ :create, :enable ] do
   mediawiki_version        = params[:version] || "1.22"
   mediawiki_reference      = "refs/heads/REL#{mediawiki_version}".tr(".", "_")
 
-  passwords = data_bag_item("mediawiki", "passwords")
-
   mediawiki = {
     :directory        => "#{site_directory}/w",
     :site             => name,
@@ -54,7 +52,7 @@ define :mediawiki_site, :action => [ :create, :enable ] do
     :site_notice      => params[:site_notice] || "",
     :site_readonly    => params[:site_readonly] || FALSE,
     :site_admin_user  => "Admin",
-    :site_admin_pw    => passwords["mediawiki-admin-user"],
+    :site_admin_pw    => params[:admin_password],
     :enable_ssl       => params[:enable_ssl] || FALSE,
     :private          => params[:private] || FALSE
   }
diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 2e540f0b5..9d95de424 100644
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -35,7 +35,9 @@ mediawiki_site  "wiki.openstreetmap.org" do
   
   database_name "wiki"
   database_username "wiki-user"
-  database_password passwords["wiki-user"]
+  database_password passwords["database"]
+
+  admin_password passwords["admin"]
 
   logo          "/osm_logo_wiki.png"