Merge pull request #11 from alchemy-fr/PHRAS-3892-custom-csp-as-env-v…

…ariable PHRAS-3892 add custom csp as env variable
alchemy-fr · Sep 22, 2023 · 906d151 · 906d151
2 parents 5d48281 + 8dacf19
commit 906d151
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/charts/phraseanet/Chart.yaml b/charts/phraseanet/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.20.0
+version: 0.21.0
 
 
 # This is the version number of the application being deployed. This version number should be

diff --git a/charts/phraseanet/templates/cronjob_phraseanet.yaml b/charts/phraseanet/templates/cronjob_phraseanet.yaml
@@ -33,6 +33,9 @@ spec:
           - name: phraseanet-custom
             persistentVolumeClaim:
               claimName: {{ $.Values.app.pvc_name.custom }}
+          - name: phraseanet-ftp
+            persistentVolumeClaim:
+              claimName: {{ .Values.app.pvc.ftp.name }}
           - name: phraseanet-tmp
             emptyDir:
           - name: phraseanet-logs
@@ -103,4 +106,4 @@ spec:
 
 {{- end }}
 {{- end }}
-{{- end }}       
+{{- end }}       
diff --git a/charts/phraseanet/templates/gateway.yml b/charts/phraseanet/templates/gateway.yml
@@ -69,4 +69,7 @@ spec:
           value: {{ .Values.http.gateway_denied_ips }}
         - name: "GATEWAY_USERS"
           value: {{ .Values.http.gateway_users }}
+        - name: "GATEWAY_CSP"
+          value: {{ .Values.http.gateway_csp }}
 {{- end }}
+
diff --git a/charts/phraseanet/values.yaml b/charts/phraseanet/values.yaml
@@ -96,6 +96,8 @@ http:
   gateway_denied_ips:
   gateway_users:
   gateway_https: "on"
+  gateway_csp: "default-src 'self' 127.0.0.1 https://apiws.carrick-skills.com:8443 https://apiws.carrick-flow.com:8443 https://fonts.gstatic.com *.tiles.mapbox.com https://api.mapbox.com https://events.mapbox.com *.axept.io *.matomo.cloud *.newrelic.com *.nr-data.net https://www.googletagmanager.com *.google-analytics.com *.phrasea.io https://apiws.carrick-flow.com:8443 https://apiws.carrick-skills.com:8443 data: ;script-src 'unsafe-inline' 'unsafe-eval' 'self' https://www.gstatic.com *.alchemyasp.com *.axept.io *.matomo.cloud *.newrelic.com https://www.googletagmanager.com https://apiws.carrick-flow.com:8443 https://apiws.carrick-skills.com:8443 ;style-src 'self' 'unsafe-inline' https://fonts.gstatic.com https://fonts.googleapis.com https://www.google.com https://www.gstatic.com https://apiws.carrick-flow.com:8443 https://apiws.carrick-skills.com:8443;img-src 'self' data: blob: *.tiles.mapbox.com https://axeptio.imgix.net *.cloudfront.net *.phrasea.io *.amazonaws.com https://apiws.carrick-flow.com:8443 https://apiws.carrick-skills.com:8443 ; object-src 'self';frame-ancestors 'self'"
+
 php:
   php_cli_memory_limit: "2048M"
   fpm_memory_limit: "2048M"