From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Wed, 16 Aug 2017 12:56:06 +0000 (+0200)
Subject: spk: add env vars
X-Git-Tag: v0.1.0~2602
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=74895516a006ba4a6a1140dceff6b0d71b9e25a3;p=pixelpark%2Fhiera.git

spk: add env vars
---

diff --git a/customer/spk-spar-checker/test.yaml b/customer/spk-spar-checker/test.yaml
index 754c726f..0e57acea 100644
--- a/customer/spk-spar-checker/test.yaml
+++ b/customer/spk-spar-checker/test.yaml
@@ -23,11 +23,11 @@ infra::profile::apache::htdigest:
 infra::profile::apache::pp_vhosts:
   sparchecker:
     docroot: /var/www/spar-checker/sparchecker-frontend
-    servername: stage-spar-checker-de.pixelpark.net
+    servername: spar-checker.stage.sparkassen-finanzportal.de
     serveraliases:
+      - stage-spar-checker-de.pixelpark.net
       - stage-web01-spar-checker-de.pixelpark.net
       - stage-web02-spar-checker-de.pixelpark.net
-      - spar-checker.stage.sparkassen-finanzportal.de
       - www.spar-checker.stage.sparkassen-finanzportal.de
     ssl: false
     docroot_owner: deploy.spk
@@ -43,8 +43,10 @@ infra::profile::apache::pp_vhosts:
           - FollowSymLinks
           - MultiViews
         allow_override:
-          - All
+          - None
         directoryindex: 'index.php index.html'
+        setenv:
+          - 'APPLICATION_ENV production'
       - location_root:
         provider: location
         path: '/'
@@ -72,8 +74,10 @@ infra::profile::apache::pp_vhosts:
           - FollowSymLinks
           - MultiViews
         allow_override:
-          - All
+          - None
         directoryindex: 'index.php index.html'
+        setenv:
+          - 'APPLICATION_ENV production'
         rewrites:
           - comment: 'sfp files'
             rewrite_cond:
@@ -81,12 +85,12 @@ infra::profile::apache::pp_vhosts:
               - '%%{ich-trickse}{REQUEST_FILENAME} -l [OR]'
               - '%%{ich-trickse}{REQUEST_FILENAME} -d'
             rewrite_rule:
-              - '^(.*)$ - [L]'
+              - '^.*$ - [L]'
           - comment: 'sfp rebase'
             rewrite_cond:
               - '%%{ich-trickse}{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$'
             rewrite_rule:
-              - '^(.*)$ - [E=BASE:%1]'
+              - '^(.*) - [E=BASE:%1]'
           - comment: 'sfp index'
             rewrite_rule:
               - '^(.*)$ %{ENV:BASE}/index.php [L]'
@@ -100,8 +104,10 @@ infra::profile::apache::pp_vhosts:
           - FollowSymLinks
           - MultiViews
         allow_override:
-          - All
+          - None
         directoryindex: 'index.php index.html'
+        setenv:
+          - 'APPLICATION_ENV production'
         rewrites:
           - comment: 'api files'
             rewrite_cond:
@@ -109,12 +115,12 @@ infra::profile::apache::pp_vhosts:
               - '%%{ich-trickse}{REQUEST_FILENAME} -l [OR]'
               - '%%{ich-trickse}{REQUEST_FILENAME} -d'
             rewrite_rule:
-              - '^(.*)$ - [L]'
+              - '^.*$ - [L]'
           - comment: 'api rebase'
             rewrite_cond:
               - '%%{ich-trickse}{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$'
             rewrite_rule:
-              - '^(.*)$ - [E=BASE:%1]'
+              - '^(.*) - [E=BASE:%1]'
           - comment: 'api index'
             rewrite_rule:
               - '^(.*)$ %{ENV:BASE}/index.php [L]'