Remove remaining uses of "normal" attributes

[chef.git] / cookbooks / mediawiki / resources / site.rb

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 0ff2dcc7463009ed032954124920534b03e42fb8..f2ff05050d5aa5d7716592f23fc6f383bff27b56 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -43,15 +43,18 @@ property :private_site, :kind_of => [TrueClass, FalseClass], :default => false
 property :recaptcha_public_key, :kind_of => String
 property :recaptcha_private_key, :kind_of => String
 property :extra_file_extensions, :kind_of => [String, Array], :default => []
 property :recaptcha_public_key, :kind_of => String
 property :recaptcha_private_key, :kind_of => String
 property :extra_file_extensions, :kind_of => [String, Array], :default => []

+property :fpm_max_children, :kind_of => Integer, :default => 5

 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do

-  node.normal_unless[:mediawiki][:sites][new_resource.site] = {}
+  node.rm_normal(:mediawiki, :sites, new_resource.site)

 
 

-  node.normal[:mediawiki][:sites][new_resource.site][:directory] = site_directory
-  node.normal[:mediawiki][:sites][new_resource.site][:version] = new_resource.version
+  node.default[:mediawiki][:sites][new_resource.site] = {
+    :directory => site_directory,
+    :version => new_resource.version
+  }

 
 

-  node.normal_unless[:mediawiki][:sites][new_resource.site][:wgSecretKey] = SecureRandom.base64(48)
+  secret_key = persistent_token("mediawiki", new_resource.site, "wgSecretKey")

 
   mysql_user "#{new_resource.database_user}@localhost" do
     password new_resource.database_password
 
   mysql_user "#{new_resource.database_user}@localhost" do
     password new_resource.database_password


@@ -94,13 +97,13 @@ action :create do
   declare_resource :directory, site_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
   declare_resource :directory, site_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0o775
+    mode "775"

   end
 
   declare_resource :directory, mediawiki_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
   end
 
   declare_resource :directory, mediawiki_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0o775
+    mode "775"

   end
 
   mediawiki_reference = "REL#{new_resource.version}".tr(".", "_")
   end
 
   mediawiki_reference = "REL#{new_resource.version}".tr(".", "_")


@@ -130,7 +133,7 @@ action :create do
     source "composer.local.json.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
     source "composer.local.json.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0o664
+    mode "664"

   end
 
   # Safety catch if git doesn't update but install.php hasn't run
   end
 
   # Safety catch if git doesn't update but install.php hasn't run


@@ -147,19 +150,19 @@ action :create do
   declare_resource :directory, "#{mediawiki_directory}/images" do
     owner "www-data"
     group node[:mediawiki][:group]
   declare_resource :directory, "#{mediawiki_directory}/images" do
     owner "www-data"
     group node[:mediawiki][:group]

-    mode 0o775
+    mode "775"

   end
 
   declare_resource :directory, "#{mediawiki_directory}/cache" do
     owner "www-data"
     group node[:mediawiki][:group]
   end
 
   declare_resource :directory, "#{mediawiki_directory}/cache" do
     owner "www-data"
     group node[:mediawiki][:group]

-    mode 0o775
+    mode "775"

   end
 
   declare_resource :directory, "#{mediawiki_directory}/LocalSettings.d" do
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
   end
 
   declare_resource :directory, "#{mediawiki_directory}/LocalSettings.d" do
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0o775
+    mode "775"

   end
 
   template "#{mediawiki_directory}/LocalSettings.php" do
   end
 
   template "#{mediawiki_directory}/LocalSettings.php" do


@@ -167,18 +170,15 @@ action :create do
     source "LocalSettings.php.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
     source "LocalSettings.php.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0o664
+    mode "664"

     variables :name => new_resource.site,
               :directory => mediawiki_directory,
               :database_params => database_params,
     variables :name => new_resource.site,
               :directory => mediawiki_directory,
               :database_params => database_params,

-              :mediawiki => mediawiki_params
+              :mediawiki => mediawiki_params,
+              :secret_key => secret_key

     notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
   end
 
     notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
   end
 

-  file "/etc/cron.d/mediawiki-#{cron_name}" do
-    action :delete
-  end
-

   cron_d "mediawiki-#{cron_name}-sitemap" do
     comment "Generate sitemap.xml daily"
     minute "30"
   cron_d "mediawiki-#{cron_name}-sitemap" do
     comment "Generate sitemap.xml daily"
     minute "30"


@@ -230,7 +230,7 @@ action :create do
     source "mediawiki-backup.cron.erb"
     owner "root"
     group "root"
     source "mediawiki-backup.cron.erb"
     owner "root"
     group "root"

-    mode 0o700
+    mode "700"

     variables :name => new_resource.site,
               :directory => site_directory,
               :database_params => database_params
     variables :name => new_resource.site,
               :directory => site_directory,
               :database_params => database_params


@@ -497,7 +497,7 @@ action :create do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0o644
+    mode "644"

     backup false
   end
 
     backup false
   end
 


@@ -505,7 +505,7 @@ action :create do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0o644
+    mode "644"

     backup false
   end
 
     backup false
   end
 


@@ -513,7 +513,7 @@ action :create do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0o644
+    mode "644"

     backup false
   end
 
     backup false
   end
 


@@ -521,6 +521,15 @@ action :create do
     domains [new_resource.site] + Array(new_resource.aliases)
   end
 
     domains [new_resource.site] + Array(new_resource.aliases)
   end
 

+  php_fpm new_resource.site do
+    pm_max_children new_resource.fpm_max_children
+    php_admin_values "open_basedir" => "#{site_directory}/:/usr/share/php/:/dev/null:/tmp/"
+    php_values "memory_limit" => "500M",
+               "max_execution_time" => "240",
+               "upload_max_filesize" => "70M",
+               "post_max_size" => "100M"
+  end
+

   apache_site new_resource.site do
     cookbook "mediawiki"
     template "apache.erb"
   apache_site new_resource.site do
     cookbook "mediawiki"
     template "apache.erb"


@@ -548,7 +557,7 @@ action :update do
     source "LocalSettings.php.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
     source "LocalSettings.php.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]

-    mode 0o664
+    mode "664"

     variables :name => new_resource.site,
               :directory => mediawiki_directory,
               :database_params => database_params,
     variables :name => new_resource.site,
               :directory => mediawiki_directory,
               :database_params => database_params,


@@ -586,6 +595,8 @@ action :delete do
 end
 
 action_class do
 end
 
 action_class do

+  include Chef::Mixin::PersistentToken
+

   def site_directory
     new_resource.directory || "/srv/#{new_resource.site}"
   end
   def site_directory
     new_resource.directory || "/srv/#{new_resource.site}"
   end