etrip chart: place secondary etrip's sessions in separate redis stora…

…ge, remove b2b section from secondary fpm config

charts/etrip/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v1
 name: etrip
 description: eTrip PHP Helm chart
 type: application
-version: 0.7.10
-appVersion: 6.5.42
+version: 0.7.11
+appVersion: 6.5.48

charts/etrip/templates/configmap-secondary.yml

@@ -233,7 +233,7 @@ data:
     clear_env = no
     {{- if $.Values.etrip.use_redis }}
     php_value[session.save_handler] = redis
-    php_value[session.save_path] = "tcp://{{ $.Release.Name }}-redis:6379?auth=${REDIS_SECRET}"
+    php_value[session.save_path] = "tcp://{{ $.Release.Name }}-redis:6379?auth=${REDIS_SECRET}&prefix=PHPSESS2"
     {{- end }}
     {{- with $val.phpValues -}}
     {{- range $pkey, $pval := . }}
@@ -245,34 +245,4 @@ data:
     {{- end }}{{end}}
     {{- end }}
     {{- end }}
-
-    {{- range $key, $instance := .Values.b2b }}
-    {{ $val := mergeOverwrite (deepCopy $.Values.b2b_defaults.fpm) $instance.fpm }}
-    {{- if not ($val.disabled) }}
-
-    [fpm-b2b-{{$key}}]
-    listen = {{ $val.port }}
-    pm = {{ $val.mode | default "dynamic" }}
-    pm.max_children = {{ $val.max }}
-    pm.start_servers = {{ $val.start }}
-    pm.min_spare_servers = {{ $val.low }}
-    pm.max_spare_servers = {{ $val.high }}
-    ping.path = /ping
-    request_terminate_timeout = 300
-    clear_env = no
-    {{- if $.Values.etrip.use_redis }}
-    php_value[session.save_handler] = redis
-    php_value[session.save_path] = "tcp://{{ $.Release.Name }}-redis:6379?auth=${REDIS_SECRET}"
-    {{- end }}
-    {{- with $val.phpValues -}}
-    {{- range $pkey, $pval := . }}
-    php_value[{{$pkey}}] = {{$pval}}
-    {{- end }}{{end}}
-    {{- with $val.phpAdminValues -}}
-    {{- range $pkey, $pval := . }}
-    php_admin_value[{{$pkey}}] = {{$pval}}
-    {{- end }}{{end}}
-    env[B2B_CONFIG] = /config/b2b-{{$key}}.json
-    {{- end }}
-    {{- end }}
 {{- end }}