diff options
| author | Michael Scherer <misc@mageia.org> | 2010-12-15 01:39:27 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-12-15 01:39:27 +0000 |
| commit | 6c0bc81bed7043b88eb613f7218f447cd027585f (patch) | |
| tree | 413646d8d1a5e2fac4b8f4826233cb3e6b6ac172 /modules | |
| parent | 0a11b000f7319cc4c4dc48682d413ddd563c90af (diff) | |
| download | puppet-6c0bc81bed7043b88eb613f7218f447cd027585f.tar puppet-6c0bc81bed7043b88eb613f7218f447cd027585f.tar.gz puppet-6c0bc81bed7043b88eb613f7218f447cd027585f.tar.bz2 puppet-6c0bc81bed7043b88eb613f7218f447cd027585f.tar.xz puppet-6c0bc81bed7043b88eb613f7218f447cd027585f.zip | |
do not use a variable called module in template, this is a reserved ruby keyword
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/apache/manifests/init.pp | 2 | ||||
| -rw-r--r-- | modules/apache/templates/django.wsgi | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index 04ca16e1..a46a0974 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -119,6 +119,8 @@ class apache { 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", diff --git a/modules/apache/templates/django.wsgi b/modules/apache/templates/django.wsgi index 90521653..194e28d8 100644 --- a/modules/apache/templates/django.wsgi +++ b/modules/apache/templates/django.wsgi @@ -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 |