aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-06-25 14:41:32 +0000
committerNicolas Vigier <boklm@mageia.org>2013-06-25 14:41:32 +0000
commit5e8c30538ec900dc6c389ea47899b10f1fa0b8e3 (patch)
tree2a189b35d068819b8d43eecb421d24bda55958a5
parent22291867510961252b08994fa5c82002a85528a7 (diff)
downloadpuppet-5e8c30538ec900dc6c389ea47899b10f1fa0b8e3.tar
puppet-5e8c30538ec900dc6c389ea47899b10f1fa0b8e3.tar.gz
puppet-5e8c30538ec900dc6c389ea47899b10f1fa0b8e3.tar.bz2
puppet-5e8c30538ec900dc6c389ea47899b10f1fa0b8e3.tar.xz
puppet-5e8c30538ec900dc6c389ea47899b10f1fa0b8e3.zip
Enable https for static.mageia.org
-rw-r--r--deployment/websites/templates/vhost_static.conf33
1 files changed, 33 insertions, 0 deletions
diff --git a/deployment/websites/templates/vhost_static.conf b/deployment/websites/templates/vhost_static.conf
index 6521b469..866d235a 100644
--- a/deployment/websites/templates/vhost_static.conf
+++ b/deployment/websites/templates/vhost_static.conf
@@ -28,3 +28,36 @@
AllowOverride None
</Directory>
</VirtualHost>
+
+<VirtualHost *:443>
+ ServerName static.<%= domain %>
+
+ DocumentRoot <%= vhostdir %>
+ CustomLog /var/log/httpd/static_log combined
+ ErrorLog /var/log/httpd/error_static_log
+
+<%= scope.function_template(["apache/vhost_ssl.conf"]) %>
+
+ FileETag none
+ Header unset ETag
+ ExpiresActive On
+ ExpiresByType text/css "access plus 1 month"
+ ExpiresByType image/gif "access plus 2 months"
+ ExpiresByType image/png "access plus 2 months"
+ ExpiresByType image/jpeg "access plus 2 months"
+ ExpiresByType image/x-icon "access plus 2 months"
+ ExpiresByType application/x-javascript "access plus 1 month"
+ ExpiresByType text/javascript "access plus 1 month"
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+ AddOutputFilterByType DEFLATE application/json text/javascript application/javascript application/x-javascript
+
+ <Location />
+ Allow from all
+ </Location>
+
+ <Directory <%= vhostdir %>>
+ Order deny,allow
+ Allow from All
+ AllowOverride None
+ </Directory>
+</VirtualHost>