diff options
| author | Michael Scherer <misc@mageia.org> | 2011-02-01 12:44:56 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-02-01 12:44:56 +0000 |
| commit | 5f48726bdd74314f18442aaf2a7468c511e2d8e2 (patch) | |
| tree | 46f9ab3b6c65353ab9b969710deee1267464d194 /modules/apache | |
| parent | ad0e70339ca79d98cb2cec02366b16c88b45787e (diff) | |
| download | puppet-5f48726bdd74314f18442aaf2a7468c511e2d8e2.tar puppet-5f48726bdd74314f18442aaf2a7468c511e2d8e2.tar.gz puppet-5f48726bdd74314f18442aaf2a7468c511e2d8e2.tar.bz2 puppet-5f48726bdd74314f18442aaf2a7468c511e2d8e2.tar.xz puppet-5f48726bdd74314f18442aaf2a7468c511e2d8e2.zip | |
- add support of aliases definition, prior to vhost_wsgi type merge
Diffstat (limited to 'modules/apache')
| -rw-r--r-- | modules/apache/manifests/init.pp | 3 | ||||
| -rw-r--r-- | modules/apache/templates/vhost_base.conf | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index ea34f1fb..5255c072 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -106,6 +106,7 @@ class apache { $location = '/dev/null', $use_ssl = false, $vhost = false, + $aliases = {}, $enable_public_html = false) { if ! $vhost { $real_vhost = $name @@ -172,7 +173,7 @@ class apache { } } - define vhost_wsgi($wsgi_path, $aliases = false) { + define vhost_wsgi($wsgi_path, $aliases = {}) { include apache::mod_wsgi file { "$name.conf": path => "/etc/httpd/conf/vhosts.d/$name.conf", diff --git a/modules/apache/templates/vhost_base.conf b/modules/apache/templates/vhost_base.conf index 486bb964..8e818f48 100644 --- a/modules/apache/templates/vhost_base.conf +++ b/modules/apache/templates/vhost_base.conf @@ -22,7 +22,9 @@ end UserDir disabled </IfModule> <%- end -%> - +<%- aliases.each_pair do |key,value| -%> + Alias <%= key %> <%= value %> +<%- end -%> <%= content %> <Location /> |