Switch wordpress sites to letsencrypt certificates

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 02479580b02ee5fd481576366037b25acfc6eb7b..33e34dbb742067243d00cd8f1eb1ab0aedb96ec4 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -34,8 +34,6 @@ wordpress_site "blog.openstreetmap.org" do
            "blog.openstreetmap.net", "blog.openstreetmaps.org",
            "blog.osmfoundation.org"]
   ssl_enabled true
-  ssl_certificate "osmfoundation"
-  ssl_certificate_chain "startcom"
   directory "/srv/blog.openstreetmap.org/wp"
   database_name "osm-blog"
   database_user "osm-blog-user"

diff --git a/cookbooks/wordpress/providers/site.rb b/cookbooks/wordpress/providers/site.rb
index 25c5aadb2881a321f4cf9915a6b8d1fd51bd7edf..0920fe9c12c532237db359d4cad22ba4d0e9ecc6 100644 (file)
--- a/cookbooks/wordpress/providers/site.rb
+++ b/cookbooks/wordpress/providers/site.rb
@@ -134,9 +134,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
 

diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index 9b5e4dabfb503799bba99071b09386c3412a608d..a5e19a1efd6fb11ff363c8ee4fc6e590cdd5eb6c 100644 (file)
--- a/cookbooks/wordpress/resources/site.rb
+++ b/cookbooks/wordpress/resources/site.rb
@@ -29,8 +29,6 @@ attribute :database_user, :kind_of => String, :required => true
 attribute :database_password, :kind_of => String, :required => true
 attribute :database_prefix, :kind_of => String, :default => "wp_"
 attribute :ssl_enabled, :kind_of => [TrueClass, FalseClass], :default => false
-attribute :ssl_certificate, :kind_of => String
-attribute :ssl_certificate_chain, :kind_of => String
 attribute :urls, :kind_of => Hash, :default => {}
 attribute :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 

diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index b627051000d7c4cfeb9f8a091c54c5597f34c68c..6281fc2dbb859459cc887430d0ef31e304f375fd 100644 (file)
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -24,17 +24,9 @@
 
   ServerAdmin webmaster@openstreetmap.org
 
-  #
-  # Enable SSL
-  #
   SSLEngine on
-<% if @ssl_certificate -%>
-  SSLCertificateFile /etc/ssl/certs/<%= @ssl_certificate %>.pem
-  SSLCertificateKeyFile /etc/ssl/private/<%= @ssl_certificate %>.key
-<% end -%>
-<% if @ssl_certificate -%>
-  SSLCertificateChainFile /etc/ssl/certs/<%= @ssl_certificate_chain %>.pem
-<% end -%>
+  SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+  SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
   CustomLog /var/log/apache2/<%= @name %>-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-error.log