diff options
| author | Michael Scherer <misc@mageia.org> | 2011-02-01 12:45:03 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-02-01 12:45:03 +0000 |
| commit | b7a7b22efc463723002babb4309ca2a99224e861 (patch) | |
| tree | e4461e831e59433a420df86e30bb72edade55588 /modules | |
| parent | d57cf2a10c9b420331f5766098542ed9f738e944 (diff) | |
| download | puppet-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')
| -rw-r--r-- | modules/apache/manifests/init.pp | 4 | ||||
| -rw-r--r-- | modules/apache/templates/vhost_base.conf | 3 |
2 files changed, 6 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") } } 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 -%> |