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
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [621] add ssl support to django deployment class
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B621%5D%20add%20ssl%20support%20to%20django%20deployment%20class&In-Reply-To=%3C20101215031152.6C697401B2%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="001222.html">
<LINK REL="Next" HREF="001225.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [621] add ssl support to django deployment class</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B621%5D%20add%20ssl%20support%20to%20django%20deployment%20class&In-Reply-To=%3C20101215031152.6C697401B2%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [621] add ssl support to django deployment class">root at mageia.org
</A><BR>
<I>Wed Dec 15 04:11:52 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="001222.html">[Mageia-sysadm] Puppet Report for alamut.mageia.org
</A></li>
<LI>Next message: <A HREF="001225.html">[Mageia-sysadm] [622] force ssl for transifex, to protect login
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1224">[ date ]</a>
<a href="thread.html#1224">[ thread ]</a>
<a href="subject.html#1224">[ subject ]</a>
<a href="author.html#1224">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 621
Author: misc
Date: 2010-12-15 04:11:52 +0100 (Wed, 15 Dec 2010)
Log Message:
-----------
add ssl support to django deployment class
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-12-15 01:39:37 UTC (rev 620)
+++ puppet/modules/apache/manifests/init.pp 2010-12-15 03:11:52 UTC (rev 621)
@@ -116,9 +116,17 @@
}
}
- define vhost_django_app($module = false, $module_path = false) {
+ define vhost_django_app($module = false, $module_path = false, $use_ssl = false) {
include apache::mod_wsgi
+ if $use_ssl {
+ include apache::mod_ssl
+ openssl::self_signed_cert{ "$name":
+ directory => "/etc/ssl/apache/",
+ before => File["$name.conf"],
+ }
+ }
+
# module is a ruby reserved keyword, cannot be used in templates
$django_module = $module
file { "$name.conf":
Modified: puppet/modules/apache/templates/vhost_django_app.conf
===================================================================
--- puppet/modules/apache/templates/vhost_django_app.conf 2010-12-15 01:39:37 UTC (rev 620)
+++ puppet/modules/apache/templates/vhost_django_app.conf 2010-12-15 03:11:52 UTC (rev 621)
@@ -1,4 +1,17 @@
-<VirtualHost *:80>
+<% if use_ssl then
+ port = 443
+else
+ port = 80
+end
+%>
+
+<VirtualHost *:<%= port %>>
+<% if use_ssl then %>
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/apache/<%= name %>.pem
+ SSLCertificateKeyFile /etc/ssl/apache/<%= name %>.pem
+<% end %>
+
ServerName <%= name %>
# Serve static content directly
DocumentRoot /dev/null
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101215/ecfbe935/attachment-0001.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="001222.html">[Mageia-sysadm] Puppet Report for alamut.mageia.org
</A></li>
<LI>Next message: <A HREF="001225.html">[Mageia-sysadm] [622] force ssl for transifex, to protect login
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#1224">[ date ]</a>
<a href="thread.html#1224">[ thread ]</a>
<a href="subject.html#1224">[ subject ]</a>
<a href="author.html#1224">[ 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>
|
