]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
spk-spar-checker udpate configs
authorAndreas Gerstenberg <gerstenberg@pixelpark.com>
Fri, 20 Oct 2017 10:16:20 +0000 (12:16 +0200)
committerAndreas Gerstenberg <gerstenberg@pixelpark.com>
Fri, 20 Oct 2017 10:16:20 +0000 (12:16 +0200)
customer/spk-spar-checker/production.yaml
customer/spk-spar-checker/test.yaml

index ff01c7e0513d1295525c0c8d2fc126fa6f759882..713a3336285cd95e51a51b04e559b05f9df3db56 100644 (file)
@@ -76,7 +76,16 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - None
         directoryindex: 'index.html'
-        custom_fragment: 'AddType text/plain .tmpl'
+        custom_fragment: |
+          AddType text/plain .tmpl
+              ExpiresActive On
+              ExpiresDefault A0
+              <FilesMatch "\.(html|tmpl|js)$">
+                ExpiresDefault A0
+                Header set Cache-Control "no-cache, no-store, must-revalidate, max-age=0, proxy-revalidate, no-transform"
+                Header set Pragma "no-cache"
+              </FilesMatch>
+
         rewrites:
           - comment: 'frontend root rewrite'
             rewrite_cond:
@@ -85,10 +94,11 @@ infra::profile::apache::pp_vhosts:
               - '.* /index.html [END]'
           - comment: 'frontend rewrites'
             rewrite_rule:
-              - '^code/(modernizr-custom.js|spar-checker-min.css|spar-checker-min.js|selection.json)$  - [L]'
               - '^code/(modernizr-custom|spar-checker-min|selection)-v[0-9]{1,4}\.(js|css|json)$ /code/$1.$2  [END]'
+              - '^code/(modernizr-custom.js|spar-checker-min.css|spar-checker-min.js|selection.json)$  - [L]'
               - '^media/(.*)-v[0-9]{1,4}\.(svg|jpg|png|gif)$ /media/$1.$2 [END]'
               - '^media/(.*)\.(svg|jpg|png|gif)$ - [L]'
+              - '^code/(.*)-v[0-9]{1,4}\.(tmpl|eot|svg|ttf|woff|woff2)$ /code/$1.$2 [END]'
               - '^code/.*\.(tmpl|eot|svg|ttf|woff|woff2)$  - [L]'
               - '^((401|403|404|500)\.html)$ - [L]'
               - '^(favicon-[0-9]{2}.ico)$ - [L]'
index 2f746c03a1ae8c30404624e67876b75617c454da..daed4920e560c2fd657c806da1f63a3a534bbc2f 100644 (file)
@@ -76,7 +76,10 @@ infra::profile::apache::pp_vhosts:
         directoryindex: 'index.html'
         custom_fragment: |
           AddType text/plain .tmpl
+              ExpiresActive On
+              ExpiresDefault A0
               <FilesMatch "\.(html|tmpl|js)$">
+                ExpiresDefault A0
                 Header set Cache-Control "no-cache, no-store, must-revalidate, max-age=0, proxy-revalidate, no-transform"
                 Header set Pragma "no-cache"
               </FilesMatch>
@@ -111,7 +114,6 @@ infra::profile::apache::pp_vhosts:
               - '^(opera_160.png)$ - [L]'
               - '.* /404.html [R=404,L]'
 
-
       - provider: location
         path: '/'
         limit_except: