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] [1010] add vhost for static.mageia.org
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B1010%5D%20add%20vhost%20for%20static.mageia.org&In-Reply-To=%3C31128149ed28f752d9a3e2b7401c84fd%40www.ephaone.org%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="002728.html">
<LINK REL="Next" HREF="002730.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [1010] add vhost for static.mageia.org</H1>
<B>Michael Scherer</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B1010%5D%20add%20vhost%20for%20static.mageia.org&In-Reply-To=%3C31128149ed28f752d9a3e2b7401c84fd%40www.ephaone.org%3E"
TITLE="[Mageia-sysadm] [1010] add vhost for static.mageia.org">misc at zarb.org
</A><BR>
<I>Fri Feb 11 19:15:53 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002728.html">[Mageia-sysadm] [992] Enable signature again.
</A></li>
<LI>Next message: <A HREF="002730.html">[Mageia-sysadm] [1010] add vhost for static.mageia.org
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2729">[ date ]</a>
<a href="thread.html#2729">[ thread ]</a>
<a href="subject.html#2729">[ subject ]</a>
<a href="author.html#2729">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE> On Fri, 11 Feb 2011 17:46:37 +0100 (CET), <A HREF="https://www.mageia.org/mailman/listinfo/mageia-sysadm">root at mageia.org</A> wrote:
><i> Revision: 1010
</I>><i> Author: boklm
</I>><i> Date: 2011-02-11 17:46:37 +0100 (Fri, 11 Feb 2011)
</I>><i> Log Message:
</I>><i> -----------
</I>><i> add vhost for static.mageia.org
</I>><i>
</I>><i> Modified Paths:
</I>><i> --------------
</I>><i> puppet/deployment/websites/manifests/init.pp
</I>><i>
</I>><i> Added Paths:
</I>><i> -----------
</I>><i> puppet/deployment/websites/templates/vhost_static.conf
</I>><i>
</I>><i> Modified: puppet/deployment/websites/manifests/init.pp
</I>><i> ===================================================================
</I>><i> --- puppet/deployment/websites/manifests/init.pp 2011-02-11 15:39:14
</I>><i> UTC (rev 1009)
</I>><i> +++ puppet/deployment/websites/manifests/init.pp 2011-02-11 16:46:37
</I>><i> UTC (rev 1010)
</I>><i> @@ -1,4 +1,16 @@
</I>><i> class websites {
</I>><i> + class base {
</I>><i> + # FIXME :
</I>><i> + # We should be able to define this path on each host.
</I>><i> + # Maybe using Facter ?
</I>><i> + $webdatadir = '/srv/web1-dd0/www'
</I>
This path is ugly and really do not help much to know what is there.
What is wrong with the /var/www we used everywhere ?
><i> + # vhost to host static files used by web sites
</I>><i> + class static inherits base {
</I>><i> + $vhostdir = "$webdatadir/static.$domain"
</I>><i> + $svn_location = "<A HREF="svn://svn.$domain/svn/web/www/trunk/g/">svn://svn.$domain/svn/web/www/trunk/g/</A>"
</I>
the same goes for this one ( yes, I already told it on irc , but I rest
my case, this is not gonna
help in the futur to have a readable system, much like the bunch of
symlink on mandriva cluster
created just by pure lazyness ).
><i> +<VirtualHost *:80>
</I>><i> + ServerName static.<%= domain %>
</I>><i> +
</I>><i> + DocumentRoot <%= vhostdir %>
</I>><i> + CustomLog /var/log/httpd/static_log combined
</I>><i> + ErrorLog /var/log/httpd/error_static_log
</I>><i> +
</I>><i> + FileETag none
</I>><i> + Header unset ETag
</I>><i> +    ExpiresActive On
</I>><i> +    ExpiresByType text/css "access plus 1 month"
</I>><i> +   ExpiresByType image/gif "access plus 2 months"
</I>><i> +   ExpiresByType image/png "access plus 2 months"
</I>><i> +   ExpiresByType image/jpeg "access plus 2 months"
</I>><i> +   ExpiresByType image/x-icon "access plus 2 months"
</I>><i> +   ExpiresByType application/x-javascript "access plus 1 month"
</I>><i> +   ExpiresByType text/javascript "access plus 1 month"
</I>><i> +   AddOutputFilterByType DEFLATE text/html text/plain text/xml
</I>><i> text/css
</I>><i> +   AddOutputFilterByType DEFLATE application/json text/javascript
</I>><i> application/javascript application/x-javascript
</I>><i> +
</I>><i> + <Location />
</I>><i> + Allow from all
</I>><i> + </Location>
</I>><i> +
</I>><i> + <Directory <%= vhostdir %>>
</I>><i> + Order deny,allow
</I>><i> + Allow from All
</I>><i> + AllowOverride None
</I>><i> + </Directory>
</I>><i> +</VirtualHost>
</I>
I think you should take in account the templates I wrote for apache,
much more concise :
<A HREF="http://svnweb.mageia.org/adm/puppet/modules/apache/manifests/init.pp?revision=1021&view=markup">http://svnweb.mageia.org/adm/puppet/modules/apache/manifests/init.pp?revision=1021&view=markup</A>
And also we should make sure mod_deplate is installed
--
Michael Scherer
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002728.html">[Mageia-sysadm] [992] Enable signature again.
</A></li>
<LI>Next message: <A HREF="002730.html">[Mageia-sysadm] [1010] add vhost for static.mageia.org
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2729">[ date ]</a>
<a href="thread.html#2729">[ thread ]</a>
<a href="subject.html#2729">[ subject ]</a>
<a href="author.html#2729">[ 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>
|
