From 53b87cc2b283df665a46a5781974f9ffd047c72c Mon Sep 17 00:00:00 2001
From: guido <guido@bruo.org>
Date: Mon, 12 Jan 2015 12:43:35 -0300
Subject: Adds apache support for webapp.domain if defined. Fixes #6632

Change-Id: If63aac60e44c4a68f030f93e20e8dc071f9df610
---
 puppet/modules/site_apache/templates/vhosts.d/common.conf.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'puppet/modules/site_apache')

diff --git a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
index a5f1fc51..87c40005 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb
@@ -7,7 +7,9 @@
 </VirtualHost>
 
 <VirtualHost *:443>
-  ServerName <%= domain_name %>
+
+  ServerName <%= webapp_domain %>
+  ServerAlias <%= domain_name %>
   ServerAlias <%= domain %>
   ServerAlias www.<%= domain %>
   CustomLog ${APACHE_LOG_DIR}/other_vhosts_access.log common
-- 
cgit v1.2.3