aboutsummaryrefslogtreecommitdiffstats
path: root/modules/apache/manifests
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/manifests
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/manifests')
-rw-r--r--modules/apache/manifests/init.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index 48ca2cdb..5f441685 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -107,6 +107,7 @@ class apache {
$use_ssl = false,
$vhost = false,
$aliases = {},
+ $server_aliases = [],
$enable_public_html = false) {
if ! $vhost {
$real_vhost = $name
@@ -174,10 +175,11 @@ class apache {
}
}
- define vhost_wsgi($wsgi_path, $aliases = {}) {
+ define vhost_wsgi($wsgi_path, $aliases = {}, $server_aliases = []) {
include apache::mod_wsgi
vhost_base { $name:
aliases => $aliases,
+ server_aliases => $server_aliases,
content => template("apache/vhost_wsgi.conf")
}
}