Modified: puppet/modules/apache/manifests/init.pp
===================================================================
--- puppet/modules/apache/manifests/init.pp 2010-12-14 18:29:48 UTC (rev 611)
+++ puppet/modules/apache/manifests/init.pp 2010-12-15 01:39:27 UTC (rev 612)
@@ -119,6 +119,8 @@
define vhost_django_app($module, $module_path = '/usr/share') {
include apache::mod_wsgi
+ # module is a ruby reserved keyword, cannot be used in templates
+ $django_module = $module
file { "$name.conf":
path => "/etc/httpd/conf/vhosts.d/$name.conf",
ensure => "present",
Modified: puppet/modules/apache/templates/django.wsgi
===================================================================
--- puppet/modules/apache/templates/django.wsgi 2010-12-14 18:29:48 UTC (rev 611)
+++ puppet/modules/apache/templates/django.wsgi 2010-12-15 01:39:27 UTC (rev 612)
@@ -1,7 +1,7 @@
#!/usr/bin/python
import os, sys
sys.path.append('<%= module_path %>')
-os.environ['DJANGO_SETTINGS_MODULE'] = '<%= module %>.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = '<%= django_module %>.settings'
import django.core.handlers.wsgi