summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2010-November/000298.html
blob: 227663bd3d89c74e6abc6ae5aad2e4a2a24116db (plain)
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
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [176] - add a type for vhost redirection to ssl ( for epoll and catdap, once we have https )
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B176%5D%20-%20add%20a%20type%20for%20vhost%20redirection%20to%20ssl%20%28%0A%20for%20epoll%20and%20catdap%2C%20once%20we%20have%20https%20%29&In-Reply-To=%3C20101106093603.7838E3F8D0%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="000297.html">
   <LINK REL="Next"  HREF="000299.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [176] - add a type for vhost redirection to ssl ( for epoll and catdap, once we have https )</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B176%5D%20-%20add%20a%20type%20for%20vhost%20redirection%20to%20ssl%20%28%0A%20for%20epoll%20and%20catdap%2C%20once%20we%20have%20https%20%29&In-Reply-To=%3C20101106093603.7838E3F8D0%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [176] - add a type for vhost redirection to ssl ( for epoll and catdap, once we have https )">root at mageia.org
       </A><BR>
    <I>Sat Nov  6 10:36:03 CET 2010</I>
    <P><UL>
        <LI>Previous message: <A HREF="000297.html">[Mageia-sysadm] [175] - notice the file is in svn
</A></li>
        <LI>Next message: <A HREF="000299.html">[Mageia-sysadm] [177] Add puppet conf for transifex
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#298">[ date ]</a>
              <a href="thread.html#298">[ thread ]</a>
              <a href="subject.html#298">[ subject ]</a>
              <a href="author.html#298">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>Revision: 176
Author:   misc
Date:     2010-11-06 10:36:03 +0100 (Sat, 06 Nov 2010)
Log Message:
-----------
- add a type for vhost redirection to ssl ( for epoll and catdap, once we have https )

Modified Paths:
--------------
    puppet/modules/apache/manifests/init.pp

Added Paths:
-----------
    puppet/modules/apache/templates/vhost_ssl_redirect.conf

Modified: puppet/modules/apache/manifests/init.pp
===================================================================
--- puppet/modules/apache/manifests/init.pp	2010-11-06 09:00:37 UTC (rev 175)
+++ puppet/modules/apache/manifests/init.pp	2010-11-06 09:36:03 UTC (rev 176)
@@ -54,8 +54,20 @@
         }
     }
 
-    define vhost_catalyst_app($script, $process = 4, $force_ssl = false) {
+    define vhost_redirect_ssl() {
+        file { &quot;redirect_ssl_$name.conf&quot;:
+            path =&gt; &quot;/etc/httpd/conf/vhosts.d/redirect_ssl_$name.conf&quot;,
+            ensure =&gt; &quot;present&quot;,
+            owner =&gt; root,
+            group =&gt; root,
+            mode =&gt; 644,
+            notify =&gt; Service['apache'],
+            content =&gt; template(&quot;apache/vhost_ssl_redirect.conf&quot;)
+        }
+    }
 
+    define vhost_catalyst_app($script, $process = 4, $use_ssl = false) {
+
         include apache::mod_fastcgi 
 
         file { &quot;$name.conf&quot;:

Added: puppet/modules/apache/templates/vhost_ssl_redirect.conf
===================================================================
--- puppet/modules/apache/templates/vhost_ssl_redirect.conf	                        (rev 0)
+++ puppet/modules/apache/templates/vhost_ssl_redirect.conf	2010-11-06 09:36:03 UTC (rev 176)
@@ -0,0 +1,4 @@
+&lt;VirtualHost *:80&gt;
+        ServerName &lt;%= vhost %&gt;
+        Redirect / <A HREF="https://&lt;%=">https://&lt;%=</A> vhost %&gt;/
+&lt;/VirtualHost&gt;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: &lt;/pipermail/mageia-sysadm/attachments/20101106/c723cc9b/attachment.html&gt;
</PRE>




<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="000297.html">[Mageia-sysadm] [175] - notice the file is in svn
</A></li>
	<LI>Next message: <A HREF="000299.html">[Mageia-sysadm] [177] Add puppet conf for transifex
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#298">[ date ]</a>
              <a href="thread.html#298">[ thread ]</a>
              <a href="subject.html#298">[ subject ]</a>
              <a href="author.html#298">[ 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>