Fix restarting of chef-client on Ubuntu 15.10 and newer

[chef.git] / cookbooks / chef / templates / default / apache.erb

diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb
index f758e983553eeb8380677f7577018854b3fd7797..f6c1806b1f704031ffe72065f9cff6df75137f1e 100644 (file)
--- a/cookbooks/chef/templates/default/apache.erb
+++ b/cookbooks/chef/templates/default/apache.erb
@@ -15,16 +15,11 @@
        ServerName chef.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerName chef.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 

-       SSLEngine on
-       SSLProtocol all -SSLv2
-       SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW
-       SSLCertificateFile /etc/ssl/certs/openstreetmap.pem
-       SSLCertificateKeyFile /etc/ssl/private/openstreetmap.key
-

        CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 
        CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 

+       SSLEngine on

        SSLProxyEngine on
 
        SSLProxyEngine on
 

-       ProxyPass / https://127.0.0.1:4443/
+       ProxyPass / https://<%= node[:fqdn] %>:4443/

 </VirtualHost>
 </VirtualHost>