/[adm]/puppet/deployment/websites/templates/vhost_static.conf
ViewVC logotype

Diff of /puppet/deployment/websites/templates/vhost_static.conf

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1010 by boklm, Fri Feb 11 16:46:37 2011 UTC revision 3257 by boklm, Tue Jun 25 14:41:32 2013 UTC
# Line 7  Line 7 
7    
8      FileETag none      FileETag none
9      Header unset ETag      Header unset ETag
10      ExpiresActive On      ExpiresActive On
11      ExpiresByType text/css "access plus 1 month"      ExpiresByType text/css "access plus 1 month"
12      ExpiresByType image/gif "access plus 2 months"      ExpiresByType image/gif "access plus 2 months"
13      ExpiresByType image/png "access plus 2 months"      ExpiresByType image/png "access plus 2 months"
14      ExpiresByType image/jpeg "access plus 2 months"      ExpiresByType image/jpeg "access plus 2 months"
15      ExpiresByType image/x-icon "access plus 2 months"      ExpiresByType image/x-icon "access plus 2 months"
16      ExpiresByType application/x-javascript "access plus 1 month"      ExpiresByType application/x-javascript "access plus 1 month"
17      ExpiresByType text/javascript "access plus 1 month"      ExpiresByType text/javascript "access plus 1 month"
18      AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css      AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
19      AddOutputFilterByType DEFLATE application/json text/javascript application/javascript application/x-javascript      AddOutputFilterByType DEFLATE application/json text/javascript application/javascript application/x-javascript
20    
21        <Location />
22           Allow from all
23        </Location>
24    
25        <Directory <%= vhostdir %>>
26           Order deny,allow
27           Allow from All
28           AllowOverride None
29        </Directory>
30    </VirtualHost>
31    
32    <VirtualHost *:443>
33        ServerName static.<%= domain %>
34    
35        DocumentRoot <%= vhostdir %>
36        CustomLog /var/log/httpd/static_log combined
37        ErrorLog  /var/log/httpd/error_static_log
38    
39    <%= scope.function_template(["apache/vhost_ssl.conf"]) %>
40    
41        FileETag none
42        Header unset ETag
43        ExpiresActive On
44        ExpiresByType text/css "access plus 1 month"
45        ExpiresByType image/gif "access plus 2 months"
46        ExpiresByType image/png "access plus 2 months"
47        ExpiresByType image/jpeg "access plus 2 months"
48        ExpiresByType image/x-icon "access plus 2 months"
49        ExpiresByType application/x-javascript "access plus 1 month"
50        ExpiresByType text/javascript "access plus 1 month"
51        AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
52        AddOutputFilterByType DEFLATE application/json text/javascript application/javascript application/x-javascript
53    
54      <Location />      <Location />
55         Allow from all         Allow from all

Legend:
Removed from v.1010  
changed lines
  Added in v.3257

  ViewVC Help
Powered by ViewVC 1.1.30