diff options
author | kwadronaut <kwadronaut@leap.se> | 2013-09-17 20:09:10 +0200 |
---|---|---|
committer | kwadronaut <kwadronaut@leap.se> | 2013-09-22 00:08:05 +0200 |
commit | a95e00f78e07d515b49de563ca5fbcd83be0d015 (patch) | |
tree | 809319f17cf2c3505668d92f2813787791412bf2 /puppet/modules/site_apache/templates/vhosts.d/api.conf.erb | |
parent | 70284fd0e786ad838fbbd40c816f6c0d01cc1629 (diff) |
adding fqdn as default servername and moving service.domain to ServerAlias (fixing #3384)
node name and dns fqdn could be different
Also note that on local deploys that warning from #3384 will continue to exist (because of dns)
Diffstat (limited to 'puppet/modules/site_apache/templates/vhosts.d/api.conf.erb')
-rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/api.conf.erb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb index bc5ff156..2cac297e 100644 --- a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb +++ b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb @@ -7,7 +7,8 @@ Listen 0.0.0.0:<%= api_port %> <VirtualHost *:<%= api_port -%>> - ServerName <%= api_domain %> + ServerName <%= domain_name %> + ServerAlias <%= api_domain %> SSLEngine on SSLProtocol -all +SSLv3 +TLSv1 |