Commit f90e18f6 authored by Marius Burkard's avatar Marius Burkard
Browse files

- changed vhost config to reflect ssl changes

parent c68e9b82

server/conf/vhost.conf.master

+3 −3
Original line number Diff line number Diff line
@@ -60,11 +60,11 @@ 
		# <IfModule mod_headers.c>

		# Header always add Strict-Transport-Security "max-age=15768000"

		# </IfModule>

		SSLCertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt

		SSLCertificateKeyFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key

		SSLCertificateFile <tmpl_var name='ssl_crt_file'>

		SSLCertificateKeyFile <tmpl_var name='ssl_key_file'>

<tmpl_if name='has_bundle_cert'>

		<tmpl_if name='apache_version' op='<' value='2.4.8' format='version'>

		SSLCertificateChainFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.bundle

		SSLCertificateChainFile <tmpl_var name='ssl_bundle_file'>

		</tmpl_if>

		<tmpl_if name='apache_version' op='>=' value='2.4' format='version'>

		SSLUseStapling on

server/plugins-available/apache2_plugin.inc.php

+4 −0
Original line number Diff line number Diff line
@@ -1153,6 +1153,10 @@ class apache2_plugin { 
		$crt_file = $ssl_dir.'/'.$domain.'.crt';

		$bundle_file = $ssl_dir.'/'.$domain.'.bundle';



		$vhost_data['ssl_crt_file'] = $crt_file;

		$vhost_data['ssl_key_file'] = $key_file;

		$vhost_data['ssl_bundle_file'] = $bundle_file;



		if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y') {

			if(substr($domain, 0, 2) === '*.') {

				// wildcard domain not yet supported by letsencrypt!