1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [612] do not use a variable called module in template, this is a reserved ruby keyword
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B612%5D%20do%20not%20use%20a%20variable%20called%20module%20in%0A%20template%2C%20this%20is%20a%20reserved%20ruby%20keyword&In-Reply-To=%3C20101215013927.EA5964029E%40valstar.mageia.org%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="001221.html">
<LINK REL="Next" HREF="001210.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [612] do not use a variable called module in template, this is a reserved ruby keyword</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B612%5D%20do%20not%20use%20a%20variable%20called%20module%20in%0A%20template%2C%20this%20is%20a%20reserved%20ruby%20keyword&In-Reply-To=%3C20101215013927.EA5964029E%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [612] do not use a variable called module in template, this is a reserved ruby keyword">root at mageia.org
</A><BR>
<I>Wed Dec 15 02:39:27 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="001221.html">[Mageia-sysadm] Updated kernels for the Mageia Servers...
</A></li>
<LI>Next message: <A HREF="001210.html">[Mageia-sysadm] [613] add psycopg2, required for postgresql connexion
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1209">[ date ]</a>
<a href="thread.html#1209">[ thread ]</a>
<a href="subject.html#1209">[ subject ]</a>
<a href="author.html#1209">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 612
Author: misc
Date: 2010-12-15 02:39:27 +0100 (Wed, 15 Dec 2010)
Log Message:
-----------
do not use a variable called module in template, this is a reserved ruby keyword
Modified Paths:
--------------
puppet/modules/apache/manifests/init.pp
puppet/modules/apache/templates/django.wsgi
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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101215/34e34409/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="001221.html">[Mageia-sysadm] Updated kernels for the Mageia Servers...
</A></li>
<LI>Next message: <A HREF="001210.html">[Mageia-sysadm] [613] add psycopg2, required for postgresql connexion
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1209">[ date ]</a>
<a href="thread.html#1209">[ thread ]</a>
<a href="subject.html#1209">[ subject ]</a>
<a href="author.html#1209">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>
|
