/[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 3256 by boklm, Fri Feb 11 16:59:04 2011 UTC revision 3257 by boklm, Tue Jun 25 14:41:32 2013 UTC
# Line 28  Line 28 
28         AllowOverride None         AllowOverride None
29      </Directory>      </Directory>
30  </VirtualHost>  </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 />
55           Allow from all
56        </Location>
57    
58        <Directory <%= vhostdir %>>
59           Order deny,allow
60           Allow from All
61           AllowOverride None
62        </Directory>
63    </VirtualHost>

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

  ViewVC Help
Powered by ViewVC 1.1.30