diff options
| author | Michael Scherer <misc@mageia.org> | 2010-11-08 01:12:49 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-11-08 01:12:49 +0000 |
| commit | 6bcc5a6dbbb0957fb34801596485e8686f63e47a (patch) | |
| tree | 29a4ff9bd79e986fce33e57d5458019a5a67afc9 /modules/apache | |
| parent | 71b82af4e7068ce0a1ef544868486b5e96a55e09 (diff) | |
| download | puppet-6bcc5a6dbbb0957fb34801596485e8686f63e47a.tar puppet-6bcc5a6dbbb0957fb34801596485e8686f63e47a.tar.gz puppet-6bcc5a6dbbb0957fb34801596485e8686f63e47a.tar.bz2 puppet-6bcc5a6dbbb0957fb34801596485e8686f63e47a.tar.xz puppet-6bcc5a6dbbb0957fb34801596485e8686f63e47a.zip | |
- I refactored too much this doesn't work as intended for define
Diffstat (limited to 'modules/apache')
| -rw-r--r-- | modules/apache/manifests/init.pp | 13 | ||||
| -rw-r--r-- | modules/apache/templates/vhost_django_app.conf | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index e89242f7..db876955 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -1,8 +1,5 @@ class apache { - $vhost_dir = "/etc/httpd/conf/vhosts.d" - $wsgi_dir = "/usr/local/lib/wsgi" - class base { package { "apache-mpm-prefork": alias => apache, @@ -62,7 +59,7 @@ class apache { ensure => installed } - file { $wsgi_dir: + file { "/usr/local/lib/wsgi": ensure => directory, owner => root, group => root, @@ -72,7 +69,7 @@ class apache { define vhost_redirect_ssl() { file { "redirect_ssl_$name.conf": - path => "$vhost_dir/redirect_ssl_$name.conf", + path => "/etc/httpd/conf/vhosts.d/redirect_ssl_$name.conf", ensure => "present", owner => root, group => root, @@ -87,7 +84,7 @@ class apache { include apache::mod_fastcgi file { "$name.conf": - path => "$vhost_dir/$name.conf", + path => "/etc/httpd/conf/vhosts.d/$name.conf", ensure => "present", owner => root, group => root, @@ -101,7 +98,7 @@ class apache { include apache::mod_wsgi file { "$name.conf": - path => "$vhost_dir/$name.conf", + path => "/etc/httpd/conf/vhosts.d/$name.conf", ensure => "present", owner => root, group => root, @@ -112,7 +109,7 @@ class apache { # fichier django wsgi file { "$name.wsgi": - path => "$wsgi_dir/$name.wsgi", + path => "/usr/local/lib/wsgi/$name.wsgi", ensure => "present", owner => root, group => root, diff --git a/modules/apache/templates/vhost_django_app.conf b/modules/apache/templates/vhost_django_app.conf index fffd5321..270e14d0 100644 --- a/modules/apache/templates/vhost_django_app.conf +++ b/modules/apache/templates/vhost_django_app.conf @@ -3,7 +3,7 @@ # Serve static content directly DocumentRoot /dev/null - WSGIScriptAlias / <%= wsgi_dir%>/<%= name %>.wsgi + WSGIScriptAlias / /usr/local/lib/wsgi/<%= name %>.wsgi <Location /> Allow from all |