lail/ebs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix trusted host

Browse source
This commit is contained in:
ThomasSamson 2024-07-31 13:39:37 +02:00
parent 6c7dbab376
commit 1d23948d74
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/deploy.yml vendored
View file

@ -42,6 +42,7 @@ jobs:
project: ${{ steps.meta.outputs.project }} project: ${{ steps.meta.outputs.project }}
namespace: ${{ steps.meta.outputs.namespace }} namespace: ${{ steps.meta.outputs.namespace }}
storage_name: ${{ steps.meta.outputs.storage_name }} storage_name: ${{ steps.meta.outputs.storage_name }}
trusted_host: ${{ steps.meta.outputs.trusted_host }}
steps: steps:
- name: Generate metadata - name: Generate metadata
id: meta id: meta
@ -53,6 +54,9 @@ jobs:
ENVIRONMENT=prod ENVIRONMENT=prod
IMAGE_TAG=${{ github.ref_name }} IMAGE_TAG=${{ github.ref_name }}
RELEASE_NAME=prod RELEASE_NAME=prod
TRUSTED_HOST=$(echo ${{ vars.DOMAIN }} | sed 's/\./\\\\\\\\./g')
echo "trusted_host=${TRUSTED_HOST}" >> $GITHUB_OUTPUT
echo "context=${CONTEXT}" >> $GITHUB_OUTPUT echo "context=${CONTEXT}" >> $GITHUB_OUTPUT
echo "environment=${ENVIRONMENT}" >> $GITHUB_OUTPUT echo "environment=${ENVIRONMENT}" >> $GITHUB_OUTPUT
echo "image_tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT echo "image_tag=${IMAGE_TAG}" >> $GITHUB_OUTPUT
@ -125,6 +129,7 @@ jobs:
--set=php.storage.usePathStyleEndpoint=true \ --set=php.storage.usePathStyleEndpoint=true \
--set=php.storage.key="${{ secrets.storage-key }}" \ --set=php.storage.key="${{ secrets.storage-key }}" \
--set=php.storage.secret="${{ secrets.storage-secret-key }}" \ --set=php.storage.secret="${{ secrets.storage-secret-key }}" \
--set=php.trustedHosts[2]=${{ needs.meta.outputs.trusted_host }} \
--values ./helm/chart/values-${{ needs.meta.outputs.context }}.yml \ --values ./helm/chart/values-${{ needs.meta.outputs.context }}.yml \
| sed --unbuffered '/USER-SUPPLIED VALUES/,$d' ; then | sed --unbuffered '/USER-SUPPLIED VALUES/,$d' ; then
echo "Deployment has failed!" echo "Deployment has failed!"

2
helm/chart/templates/configmap.yaml
View file

@ -10,7 +10,7 @@ data:
php-app-env: {{ .Values.php.appEnv | quote }} php-app-env: {{ .Values.php.appEnv | quote }}
php-app-debug: {{ .Values.php.appDebug | quote }} php-app-debug: {{ .Values.php.appDebug | quote }}
php-cors-allow-origin: {{ .Values.php.corsAllowOrigin | quote }} php-cors-allow-origin: {{ .Values.php.corsAllowOrigin | quote }}
php-trusted-hosts: {{ .Values.php.trustedHosts | quote }} php-trusted-hosts: {{ join "|" .Values.php.trustedHosts | quote }}
php-trusted-proxies: "{{ join "," .Values.php.trustedProxies }}" php-trusted-proxies: "{{ join "," .Values.php.trustedProxies }}"
mercure-url: "http://{{ include "plateforme-ebs" . }}/.well-known/mercure" mercure-url: "http://{{ include "plateforme-ebs" . }}/.well-known/mercure"
mercure-public-url: {{ .Values.mercure.publicUrl | default "http://127.0.0.1/.well-known/mercure" | quote }} mercure-public-url: {{ .Values.mercure.publicUrl | default "http://127.0.0.1/.well-known/mercure" | quote }}

9
helm/chart/values.yaml
View file

@ -4,7 +4,7 @@
php: php:
image: image:
repository: "ghcr.io/apes-hdf/plateforme-ebs-php" # CHANGE ME repository: "ghcr.io/tipimi-fr/plateforme-ebs-php" # CHANGE ME
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "" tag: ""
@ -12,7 +12,10 @@ php:
appDebug: "0" appDebug: "0"
appSecret: "" appSecret: ""
corsAllowOrigin: "^https?://.*?\\.chart-example\\.local$" corsAllowOrigin: "^https?://.*?\\.chart-example\\.local$"
trustedHosts: "^127\\.0\\.0\\.1|localhost|.*\\.chart-example\\.local$" trustedHosts:
- "^127\\.0\\.0\\.1"
- "localhost"
- ".*\\.chart-example\\.local$"
trustedProxies: trustedProxies:
- "127.0.0.1" - "127.0.0.1"
- "10.0.0.0/8" - "10.0.0.0/8"
@ -50,7 +53,7 @@ consumer:
caddy: caddy:
image: image:
repository: "ghcr.io/apes-hdf/plateforme-ebs-caddy" # CHANGE ME repository: "ghcr.io/tipimi-fr/plateforme-ebs-caddy" # CHANGE ME
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "" tag: ""