]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
spk-spar-checker syntax cosmetic
authorAndreas Gerstenberg <gerstenberg@pixelpark.com>
Tue, 17 Oct 2017 12:21:03 +0000 (14:21 +0200)
committerAndreas Gerstenberg <gerstenberg@pixelpark.com>
Tue, 17 Oct 2017 12:21:03 +0000 (14:21 +0200)
customer/spk-spar-checker/production.yaml
customer/spk-spar-checker/test.yaml

index ebb463e1f8b02d58980f2860989bd10c793f22ce..1d0c409e1f2dd931e74182e5e5e1e46475bc1fb8 100644 (file)
@@ -70,7 +70,6 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - None
         directoryindex: 'index.html'
-# neu
         custom_fragment: 'AddType text/plain .tmpl'
         rewrites:
           - comment: 'frontend root rewrite'
@@ -137,24 +136,6 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - None
         directoryindex: 'index.php'
-# alt
-#        rewrites:
-#          - comment: 'sfp files'
-#            rewrite_cond:
-#              - '%%{ich-trickse}{REQUEST_FILENAME} -s [OR]'
-#              - '%%{ich-trickse}{REQUEST_FILENAME} -l [OR]'
-#              - '%%{ich-trickse}{REQUEST_FILENAME} -d'
-#            rewrite_rule:
-#              - '^.*$ - [L]'
-#          - comment: 'sfp rebase'
-#            rewrite_cond:
-#              - '%%{ich-trickse}{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$'
-#            rewrite_rule:
-#              - '^(.*) - [E=BASE:%1]'
-#          - comment: 'sfp index'
-#            rewrite_rule:
-#              - '^(.*)$ %%{ich-trickse}{ENV:BASE}/index.php [L]'
-# neu
         rewrites:
           - comment: 'sfp rewrites'
             rewrite_rule:
@@ -170,23 +151,6 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - None
         directoryindex: 'index.php'
-#        rewrites:
-#          - comment: 'api files'
-#            rewrite_cond:
-#              - '%%{ich-trickse}{REQUEST_FILENAME} -s [OR]'
-#              - '%%{ich-trickse}{REQUEST_FILENAME} -l [OR]'
-#              - '%%{ich-trickse}{REQUEST_FILENAME} -d'
-#            rewrite_rule:
-#              - '^.*$ - [L]'
-#          - comment: 'api rebase'
-#            rewrite_cond:
-#              - '%%{ich-trickse}{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$'
-#            rewrite_rule:
-#              - '^(.*) - [E=BASE:%1]'
-#          - comment: 'api index'
-#            rewrite_rule:
-#              - '^(.*)$ %%{ich-trickse}{ENV:BASE}/index.php [L]'
-# neu
         rewrites:
           - comment: 'api rewrites'
             rewrite_rule:
index 85c45b61c429cd8ea1e47c4c6b2ed1c23e8688ed..8be258f372cb75990356574cbb47f5552d2899b4 100644 (file)
@@ -68,7 +68,6 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - None
         directoryindex: 'index.html'
-# neu
         custom_fragment: 'AddType text/plain .tmpl'
         rewrites:
           - comment: 'frontend root rewrite'
@@ -135,24 +134,6 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - None
         directoryindex: 'index.php'
-# alt
-#        rewrites:
-#          - comment: 'sfp files'
-#            rewrite_cond:
-#              - '%%{ich-trickse}{REQUEST_FILENAME} -s [OR]'
-#              - '%%{ich-trickse}{REQUEST_FILENAME} -l [OR]'
-#              - '%%{ich-trickse}{REQUEST_FILENAME} -d'
-#            rewrite_rule:
-#              - '^.*$ - [L]'
-#          - comment: 'sfp rebase'
-#            rewrite_cond:
-#              - '%%{ich-trickse}{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$'
-#            rewrite_rule:
-#              - '^(.*) - [E=BASE:%1]'
-#          - comment: 'sfp index'
-#            rewrite_rule:
-#              - '^(.*)$ %%{ich-trickse}{ENV:BASE}/index.php [L]'
-# neu
         rewrites:
           - comment: 'sfp rewrites'
             rewrite_rule:
@@ -168,24 +149,6 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - None
         directoryindex: 'index.php'
-# alt
-#        rewrites:
-#          - comment: 'api files'
-#            rewrite_cond:
-#              - '%%{ich-trickse}{REQUEST_FILENAME} -s [OR]'
-#              - '%%{ich-trickse}{REQUEST_FILENAME} -l [OR]'
-#              - '%%{ich-trickse}{REQUEST_FILENAME} -d'
-#            rewrite_rule:
-#              - '^.*$ - [L]'
-#          - comment: 'api rebase'
-#            rewrite_cond:
-#              - '%%{ich-trickse}{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$'
-#            rewrite_rule:
-#              - '^(.*) - [E=BASE:%1]'
-#          - comment: 'api index'
-#            rewrite_rule:
-#              - '^(.*)$ %%{ich-trickse}{ENV:BASE}/index.php [L]'
-# neu
         rewrites:
           - comment: 'api rewrites'
             rewrite_rule: