X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1952990836d6687ed4030bb95ca5f9e535eaf61f..8df838bf09d95282ba29ddde8b504e0affc5f06e:/cookbooks/wordpress/providers/site.rb

diff --git a/cookbooks/wordpress/providers/site.rb b/cookbooks/wordpress/providers/site.rb
index 25c5aadb2..79f96b5d2 100644
--- a/cookbooks/wordpress/providers/site.rb
+++ b/cookbooks/wordpress/providers/site.rb
@@ -126,6 +126,7 @@ action :create do
 
   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
@@ -134,9 +135,7 @@ action :create do
     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_certificate_chain => new_resource.ssl_certificate_chain
+              :ssl_enabled => new_resource.ssl_enabled
     reload_apache false
   end
 
@@ -156,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