[Mageia-sysadm] [201] - I refactored too much this doesn't work as intended for define

[root at mageia.org]

Revision: 201
Author:   misc
Date:     2010-11-08 02:12:49 +0100 (Mon, 08 Nov 2010)
Log Message:
-----------
- I refactored too much this doesn't work as intended for define 

Modified Paths:
--------------
    puppet/modules/apache/manifests/init.pp
    puppet/modules/apache/templates/vhost_django_app.conf

Modified: puppet/modules/apache/manifests/init.pp
===================================================================
--- puppet/modules/apache/manifests/init.pp	2010-11-08 00:48:05 UTC (rev 200)
+++ puppet/modules/apache/manifests/init.pp	2010-11-08 01:12:49 UTC (rev 201)
@@ -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 @@
             ensure => installed
         }
 
-        file { $wsgi_dir:
+        file { "/usr/local/lib/wsgi":
             ensure => directory,
             owner => root,
             group => root,
@@ -72,7 +69,7 @@
 
     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 @@
         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 @@
         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 @@
 
         # fichier django wsgi
         file { "$name.wsgi":
-            path => "$wsgi_dir/$name.wsgi",
+            path => "/usr/local/lib/wsgi/$name.wsgi",
             ensure => "present",
             owner => root,
             group => root,

Modified: puppet/modules/apache/templates/vhost_django_app.conf
===================================================================
--- puppet/modules/apache/templates/vhost_django_app.conf	2010-11-08 00:48:05 UTC (rev 200)
+++ puppet/modules/apache/templates/vhost_django_app.conf	2010-11-08 01:12:49 UTC (rev 201)
@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101108/4aec9ca7/attachment-0001.html>