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
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [201] - I refactored too much this doesn't work as intended for define
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B201%5D%20-%20I%20refactored%20too%20much%20this%20doesn%27t%20work%20as%0A%09intended%20for%20define&In-Reply-To=%3C20101108011249.4B7013FC10%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="000339.html">
<LINK REL="Next" HREF="000341.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [201] - I refactored too much this doesn't work as intended for define</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B201%5D%20-%20I%20refactored%20too%20much%20this%20doesn%27t%20work%20as%0A%09intended%20for%20define&In-Reply-To=%3C20101108011249.4B7013FC10%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [201] - I refactored too much this doesn't work as intended for define">root at mageia.org
</A><BR>
<I>Mon Nov 8 02:12:49 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="000339.html">[Mageia-sysadm] puppet stopped on all nodes ?
</A></li>
<LI>Next message: <A HREF="000341.html">[Mageia-sysadm] [202] - deploy the tagmail configuration file, so we get error on manifest application
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#340">[ date ]</a>
<a href="thread.html#340">[ thread ]</a>
<a href="subject.html#340">[ subject ]</a>
<a href="author.html#340">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>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>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="000339.html">[Mageia-sysadm] puppet stopped on all nodes ?
</A></li>
<LI>Next message: <A HREF="000341.html">[Mageia-sysadm] [202] - deploy the tagmail configuration file, so we get error on manifest application
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#340">[ date ]</a>
<a href="thread.html#340">[ thread ]</a>
<a href="subject.html#340">[ subject ]</a>
<a href="author.html#340">[ 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>
|
