summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/api.conf.erb3
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb3
-rw-r--r--puppet/modules/site_webapp/manifests/apache.pp3
3 files changed, 7 insertions, 2 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 5f1f4c1d..9e2dbcaf 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
diff --git a/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb
index 5e3960c2..3b376839 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb
@@ -6,7 +6,8 @@
</VirtualHost>
<VirtualHost *:443>
- ServerName <%= domain %>
+ ServerName <%= domain_name %>
+ ServerAlias <%= domain %>
ServerAlias www.<%= domain %>
SSLEngine on
diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp
index 3dd1c4c7..d604b00f 100644
--- a/puppet/modules/site_webapp/manifests/apache.pp
+++ b/puppet/modules/site_webapp/manifests/apache.pp
@@ -4,6 +4,9 @@ class site_webapp::apache {
$api_domain = $web_api['domain']
$api_port = $web_api['port']
+ $web_domain = hiera('domain')
+ $domain_name = $web_domain['name']
+
$x509 = hiera('x509')
$commercial_key = $x509['commercial_key']
$commercial_cert = $x509['commercial_cert']