aboutsummaryrefslogtreecommitdiffstats
path: root/modules/apache/templates
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-02-01 12:45:03 +0000
committerMichael Scherer <misc@mageia.org>2011-02-01 12:45:03 +0000
commitb7a7b22efc463723002babb4309ca2a99224e861 (patch)
treee4461e831e59433a420df86e30bb72edade55588 /modules/apache/templates
parentd57cf2a10c9b420331f5766098542ed9f738e944 (diff)
downloadpuppet-b7a7b22efc463723002babb4309ca2a99224e861.tar
puppet-b7a7b22efc463723002babb4309ca2a99224e861.tar.gz
puppet-b7a7b22efc463723002babb4309ca2a99224e861.tar.bz2
puppet-b7a7b22efc463723002babb4309ca2a99224e861.tar.xz
puppet-b7a7b22efc463723002babb4309ca2a99224e861.zip
add server_aliases argument, to enable to have server aliases on vhost
Diffstat (limited to 'modules/apache/templates')
-rw-r--r--modules/apache/templates/vhost_base.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/apache/templates/vhost_base.conf b/modules/apache/templates/vhost_base.conf
index 8e818f48..7d1a0d4e 100644
--- a/modules/apache/templates/vhost_base.conf
+++ b/modules/apache/templates/vhost_base.conf
@@ -12,6 +12,9 @@ end
SSLCertificateKeyFile /etc/ssl/apache/<%= name %>.pem
<%- end -%>
ServerName <%= real_vhost %>
+<%- server_aliases.each do |key| -%>
+ ServerAlias <%= key %>
+<%- end -%>
DocumentRoot <%= location %>
<%- if enable_public_html -%>