X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/4f94ccf583d86093b3756f5999de5bfcdff99895..03b7d5e985a34d01dccfd03dc11488015e97f7df:/cookbooks/wordpress/providers/site.rb

diff --git a/cookbooks/wordpress/providers/site.rb b/cookbooks/wordpress/providers/site.rb
index 9ed0697c2..79f96b5d2 100644
--- a/cookbooks/wordpress/providers/site.rb
+++ b/cookbooks/wordpress/providers/site.rb
@@ -30,18 +30,18 @@ use_inline_resources
 action :create do
   version = new_resource.version || Chef::Wordpress.current_version
 
-  node.set_unless[:wordpress][:sites][new_resource.name] = {}
+  node.normal_unless[:wordpress][:sites][new_resource.name] = {}
 
-  node.set[:wordpress][:sites][new_resource.name][:directory] = site_directory
+  node.normal[:wordpress][:sites][new_resource.name][:directory] = site_directory
 
-  node.set_unless[:wordpress][:sites][new_resource.name][:auth_key] = SecureRandom.base64(48)
-  node.set_unless[:wordpress][:sites][new_resource.name][:secure_auth_key] = SecureRandom.base64(48)
-  node.set_unless[:wordpress][:sites][new_resource.name][:logged_in_key] = SecureRandom.base64(48)
-  node.set_unless[:wordpress][:sites][new_resource.name][:nonce_key] = SecureRandom.base64(48)
-  node.set_unless[:wordpress][:sites][new_resource.name][:auth_salt] = SecureRandom.base64(48)
-  node.set_unless[:wordpress][:sites][new_resource.name][:secure_auth_salt] = SecureRandom.base64(48)
-  node.set_unless[:wordpress][:sites][new_resource.name][:logged_in_salt] = SecureRandom.base64(48)
-  node.set_unless[:wordpress][:sites][new_resource.name][:nonce_salt] = SecureRandom.base64(48)
+  node.normal_unless[:wordpress][:sites][new_resource.name][:auth_key] = SecureRandom.base64(48)
+  node.normal_unless[:wordpress][:sites][new_resource.name][:secure_auth_key] = SecureRandom.base64(48)
+  node.normal_unless[:wordpress][:sites][new_resource.name][:logged_in_key] = SecureRandom.base64(48)
+  node.normal_unless[:wordpress][:sites][new_resource.name][:nonce_key] = SecureRandom.base64(48)
+  node.normal_unless[:wordpress][:sites][new_resource.name][:auth_salt] = SecureRandom.base64(48)
+  node.normal_unless[:wordpress][:sites][new_resource.name][:secure_auth_salt] = SecureRandom.base64(48)
+  node.normal_unless[:wordpress][:sites][new_resource.name][:logged_in_salt] = SecureRandom.base64(48)
+  node.normal_unless[:wordpress][:sites][new_resource.name][:nonce_salt] = SecureRandom.base64(48)
 
   mysql_user "#{new_resource.database_user}@localhost" do
     password new_resource.database_password
@@ -54,7 +54,7 @@ action :create do
   directory site_directory do
     owner node[:wordpress][:user]
     group node[:wordpress][:group]
-    mode 0755
+    mode 0o755
   end
 
   subversion site_directory do
@@ -98,14 +98,14 @@ action :create do
   file "#{site_directory}/wp-config.php" do
     owner node[:wordpress][:user]
     group node[:wordpress][:group]
-    mode 0644
+    mode 0o644
     content wp_config
   end
 
   directory "#{site_directory}/wp-content/uploads" do
     owner "www-data"
     group "www-data"
-    mode 0755
+    mode 0o755
   end
 
   file "#{site_directory}/sitemap.xml" do
@@ -120,18 +120,22 @@ action :create do
     cookbook "wordpress"
     owner node[:wordpress][:user]
     group node[:wordpress][:group]
-    mode 0644
+    mode 0o644
     backup false
   end
 
+  ssl_certificate new_resource.name do
+    domains [new_resource.name] + Array(new_resource.aliases)
+    only_if { new_resource.ssl_enabled }
+  end
+
   apache_site new_resource.name do
     cookbook "wordpress"
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),
               :urls => new_resource.urls,
-              :ssl_enabled => new_resource.ssl_enabled,
-              :ssl_certificate => new_resource.ssl_certificate
+              :ssl_enabled => new_resource.ssl_enabled
     reload_apache false
   end
 
@@ -151,14 +155,14 @@ action :create do
     interpreter "php"
     cwd site_directory
     user "wordpress"
-    code <<-EOS
+    code <<-WP_FAIL2BAN
     <?php
     @include "wp-config.php";
     @include_once "wp-includes/functions.php";
     @include_once "wp-admin/includes/plugin.php";
     activate_plugin("wp-fail2ban/wp-fail2ban.php", '', false, false);
     ?>
-    EOS
+    WP_FAIL2BAN
     subscribes :run, "wordpress_plugin[wp-fail2ban]"
   end
 end