diff options
| author | guido <guido@bruo.org> | 2015-01-12 12:43:35 -0300 |
|---|---|---|
| committer | guido <guido@bruo.org> | 2015-01-12 13:10:24 -0300 |
| commit | 53b87cc2b283df665a46a5781974f9ffd047c72c (patch) | |
| tree | 23d08699755258e13c372110b2cde2986b980f63 | |
| parent | 4ab1478f0fd0a5870d0db4098c388040147348e8 (diff) | |
Adds apache support for webapp.domain if defined. Fixes #6632
Change-Id: If63aac60e44c4a68f030f93e20e8dc071f9df610
| -rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/common.conf.erb | 4 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/apache.pp | 3 |
2 files changed, 6 insertions, 1 deletions
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 diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp index 21243d34..93e172a0 100644 --- a/puppet/modules/site_webapp/manifests/apache.pp +++ b/puppet/modules/site_webapp/manifests/apache.pp @@ -7,6 +7,9 @@ class site_webapp::apache { $web_domain = hiera('domain') $domain_name = $web_domain['name'] + $webapp = hiera('webapp') + $webapp_domain = $webapp['domain'] + include site_apache::common include site_apache::module::headers include site_apache::module::alias |