Update changelog.

[chef.git] / cookbooks / mediawiki / definitions / mediawiki_site.rb

diff --git a/cookbooks/mediawiki/definitions/mediawiki_site.rb b/cookbooks/mediawiki/definitions/mediawiki_site.rb
index 1cfd2a40c25c8d110c7f973a3c14bf1c2bc308ae..3e427b2498ea3ba571116d4e9fa856f2fd0b5745 100644 (file)
--- 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(".", "_")
 
   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,
   mediawiki = {
     :directory        => "#{site_directory}/w",
     :site             => name,


@@ -54,8 +52,10 @@ define :mediawiki_site, :action => [ :create, :enable ] do
     :site_notice      => params[:site_notice] || "",
     :site_readonly    => params[:site_readonly] || FALSE,
     :site_admin_user  => "Admin",
     :site_notice      => params[:site_notice] || "",
     :site_readonly    => params[:site_readonly] || FALSE,
     :site_admin_user  => "Admin",

-    :site_admin_pw    => passwords["mediawiki-admin-user"],
-    :enable_ssl       => params[:enable_ssl] || FALSE
+    :site_admin_pw    => params[:admin_password],
+    :enable_ssl       => params[:enable_ssl] || FALSE,
+    :private_accounts => params[:private_accounts] || FALSE,
+    :private          => params[:private] || FALSE

   }
 
 #----------------
   }
 
 #----------------


@@ -120,7 +120,7 @@ define :mediawiki_site, :action => [ :create, :enable ] do
     action :sync
     repository mediawiki_repository
     reference mediawiki_reference
     action :sync
     repository mediawiki_repository
     reference mediawiki_reference

-    depth 1
+    #depth 1

     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
     notifies :run, resources(:execute => "#{mediawiki[:directory]}/maintenance/install.php"), :immediately
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
     notifies :run, resources(:execute => "#{mediawiki[:directory]}/maintenance/install.php"), :immediately