aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-25 12:47:29 +0000
committerMichael Scherer <misc@mageia.org>2012-03-25 12:47:29 +0000
commit4d457240847480821a4e86eac09fed7c5983b262 (patch)
tree433d27aa8dd968466d679bac6c60699a2b16aacb
parentc7b761dabd635dc581322d8be0832a5da9ff8b99 (diff)
downloadpuppet-4d457240847480821a4e86eac09fed7c5983b262.tar
puppet-4d457240847480821a4e86eac09fed7c5983b262.tar.gz
puppet-4d457240847480821a4e86eac09fed7c5983b262.tar.bz2
puppet-4d457240847480821a4e86eac09fed7c5983b262.tar.xz
puppet-4d457240847480821a4e86eac09fed7c5983b262.zip
split vhost_wsgi in a separate file
-rw-r--r--modules/apache/manifests/init.pp9
-rw-r--r--modules/apache/manifests/vhost/wsgi.pp10
2 files changed, 10 insertions, 9 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index 7002aa7d..d97345e7 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -27,15 +27,6 @@ class apache {
}
}
- define vhost_wsgi($wsgi_path, $aliases = {}, $server_aliases = []) {
- include apache::mod::wsgi
- apache::vhost::base { $name:
- aliases => $aliases,
- server_aliases => $server_aliases,
- content => template("apache/vhost_wsgi.conf"),
- }
- }
-
define vhost_other_app($vhost_file) {
include apache::base
apache::config { "/etc/httpd/conf/vhosts.d/$name.conf":
diff --git a/modules/apache/manifests/vhost/wsgi.pp b/modules/apache/manifests/vhost/wsgi.pp
new file mode 100644
index 00000000..291c6d71
--- /dev/null
+++ b/modules/apache/manifests/vhost/wsgi.pp
@@ -0,0 +1,10 @@
+define apache::vhost::wsgi ($wsgi_path,
+ $aliases = {},
+ $server_aliases = []) {
+ include apache::mod::wsgi
+ apache::vhost::base { $name:
+ aliases => $aliases,
+ server_aliases => $server_aliases,
+ content => template('apache/vhost_wsgi.conf'),
+ }
+}