aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-01-17 15:24:07 +0000
committerMichael Scherer <misc@mageia.org>2011-01-17 15:24:07 +0000
commit182cac02836d68fe1df527c7c80aa06c2e91be0f (patch)
tree685b5dd269c85fa031db87e697f93657691a004f /modules
parentc88842cefc481ec4d89938213760302019dbe241 (diff)
downloadpuppet-182cac02836d68fe1df527c7c80aa06c2e91be0f.tar
puppet-182cac02836d68fe1df527c7c80aa06c2e91be0f.tar.gz
puppet-182cac02836d68fe1df527c7c80aa06c2e91be0f.tar.bz2
puppet-182cac02836d68fe1df527c7c80aa06c2e91be0f.tar.xz
puppet-182cac02836d68fe1df527c7c80aa06c2e91be0f.zip
new vhost_wsgi type, for viewvc support
Diffstat (limited to 'modules')
-rw-r--r--modules/apache/manifests/init.pp13
-rw-r--r--modules/apache/templates/vhost_wsgi.conf11
2 files changed, 24 insertions, 0 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index 03eee275..e21febcf 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -157,6 +157,19 @@ class apache {
}
}
+ define vhost_wsgi($wsgi_path) {
+ 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'],
+ content => template("apache/vhost_wsgi.conf")
+ }
+ }
+
define vhost_other_app($vhost_file) {
include apache::base
file { "$name.conf":
diff --git a/modules/apache/templates/vhost_wsgi.conf b/modules/apache/templates/vhost_wsgi.conf
new file mode 100644
index 00000000..5c30d337
--- /dev/null
+++ b/modules/apache/templates/vhost_wsgi.conf
@@ -0,0 +1,11 @@
+<VirtualHost *:80>
+ ServerName <%= name %>
+ # Serve static content directly
+ DocumentRoot /dev/null
+
+ WSGIScriptAlias / <%= wsgi_path %>
+ <Location />
+ Allow from all
+ </Location>
+</VirtualHost>
+