diff options
| author | Michael Scherer <misc@mageia.org> | 2011-02-01 12:44:59 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-02-01 12:44:59 +0000 |
| commit | 39e3ca75f9f7dc4e0b255eafeee89cbde00e94d6 (patch) | |
| tree | c92cb196ac6b0d67dd148fbed31c2395af6c65e4 /modules/apache | |
| parent | 5f48726bdd74314f18442aaf2a7468c511e2d8e2 (diff) | |
| download | puppet-39e3ca75f9f7dc4e0b255eafeee89cbde00e94d6.tar puppet-39e3ca75f9f7dc4e0b255eafeee89cbde00e94d6.tar.gz puppet-39e3ca75f9f7dc4e0b255eafeee89cbde00e94d6.tar.bz2 puppet-39e3ca75f9f7dc4e0b255eafeee89cbde00e94d6.tar.xz puppet-39e3ca75f9f7dc4e0b255eafeee89cbde00e94d6.zip | |
use vhost_base for vhost_wsgi type ( leaner )
Diffstat (limited to 'modules/apache')
| -rw-r--r-- | modules/apache/manifests/init.pp | 9 | ||||
| -rw-r--r-- | modules/apache/templates/vhost_wsgi.conf | 14 |
2 files changed, 3 insertions, 20 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index 5255c072..a23b6a56 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -175,13 +175,8 @@ class apache { define vhost_wsgi($wsgi_path, $aliases = {}) { include apache::mod_wsgi - file { "$name.conf": - path => "/etc/httpd/conf/vhosts.d/$name.conf", - ensure => "present", - owner => root, - group => root, - mode => 644, - notify => Service['apache'], + vhost_base { $name: + aliases => $aliases, content => template("apache/vhost_wsgi.conf") } } diff --git a/modules/apache/templates/vhost_wsgi.conf b/modules/apache/templates/vhost_wsgi.conf index c4973cd7..34926411 100644 --- a/modules/apache/templates/vhost_wsgi.conf +++ b/modules/apache/templates/vhost_wsgi.conf @@ -1,15 +1,3 @@ -<VirtualHost *:80> - ServerName <%= name %> - # Serve static content directly - DocumentRoot /dev/null +WSGIScriptAlias / <%= wsgi_path %> - WSGIScriptAlias / <%= wsgi_path %> - -<%- aliases.each_pair do |key,value| -%> - Alias <%= key %> <%= value %> -<%- end -%> - <Location /> - Allow from all - </Location> -</VirtualHost> |