From a07d8dd273e573eddaaff5e40593ef9dd58eb114 Mon Sep 17 00:00:00 2001 From: Jhony Avella Date: Fri, 5 Jul 2024 16:59:20 -0500 Subject: [PATCH] Jhony/s3 host fix palm (#122) * fix: when using SCORM, S3_HOST must be used for alternative S3-compatible services --- drydock/patches/caddyfile | 4 ++-- drydock/patches/caddyfile-cms | 4 ++-- drydock/patches/caddyfile-lms | 4 ++-- drydock/templates/drydock/k8s/ingress/cms.yml | 4 ++-- drydock/templates/drydock/k8s/ingress/lms.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drydock/patches/caddyfile b/drydock/patches/caddyfile index ebdb3605..6ef06356 100644 --- a/drydock/patches/caddyfile +++ b/drydock/patches/caddyfile @@ -32,8 +32,8 @@ } route @scorm_matcher { uri /scorm-proxy/* strip_prefix /scorm-proxy - reverse_proxy https://{{ S3_STORAGE_BUCKET }}.s3.amazonaws.com { - header_up Host {{ S3_STORAGE_BUCKET }}.s3.amazonaws.com + reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }} { + header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }} } } {% endif %} diff --git a/drydock/patches/caddyfile-cms b/drydock/patches/caddyfile-cms index 36e638e4..b6a51624 100644 --- a/drydock/patches/caddyfile-cms +++ b/drydock/patches/caddyfile-cms @@ -14,8 +14,8 @@ route @scorm_matcher { } route @scorm_matcher { uri /scorm-proxy/* strip_prefix /scorm-proxy - reverse_proxy https://{{ S3_STORAGE_BUCKET }}.s3.amazonaws.com { - header_up Host {{ S3_STORAGE_BUCKET }}.s3.amazonaws.com + reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }} { + header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }} } } {% endif %} diff --git a/drydock/patches/caddyfile-lms b/drydock/patches/caddyfile-lms index 36e638e4..b6a51624 100644 --- a/drydock/patches/caddyfile-lms +++ b/drydock/patches/caddyfile-lms @@ -14,8 +14,8 @@ route @scorm_matcher { } route @scorm_matcher { uri /scorm-proxy/* strip_prefix /scorm-proxy - reverse_proxy https://{{ S3_STORAGE_BUCKET }}.s3.amazonaws.com { - header_up Host {{ S3_STORAGE_BUCKET }}.s3.amazonaws.com + reverse_proxy https://{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }} { + header_up Host {{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }} } } {% endif %} diff --git a/drydock/templates/drydock/k8s/ingress/cms.yml b/drydock/templates/drydock/k8s/ingress/cms.yml index 7723b48e..4bd64afa 100644 --- a/drydock/templates/drydock/k8s/ingress/cms.yml +++ b/drydock/templates/drydock/k8s/ingress/cms.yml @@ -14,7 +14,7 @@ metadata: proxy_http_version 1.1; proxy_set_header Connection ""; proxy_set_header Authorization ''; - proxy_set_header Host {% if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.s3.amazonaws.com{%- endif %}; + proxy_set_header Host {% if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}{%- endif %}; proxy_hide_header x-amz-id-2; proxy_hide_header x-amz-request-id; proxy_hide_header x-amz-meta-server-side-encryption; @@ -24,7 +24,7 @@ metadata: proxy_intercept_errors on; add_header Cache-Control max-age=31536000; rewrite /scorm-proxy(.*) $1 break; - proxy_pass https://{%- if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.s3.amazonaws.com{%- endif %}; + proxy_pass https://{%- if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}{%- endif %}; } {%- endif %} spec: diff --git a/drydock/templates/drydock/k8s/ingress/lms.yml b/drydock/templates/drydock/k8s/ingress/lms.yml index 58b370a4..75a78b2f 100644 --- a/drydock/templates/drydock/k8s/ingress/lms.yml +++ b/drydock/templates/drydock/k8s/ingress/lms.yml @@ -14,7 +14,7 @@ metadata: proxy_http_version 1.1; proxy_set_header Connection ""; proxy_set_header Authorization ''; - proxy_set_header Host {% if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.s3.amazonaws.com{%- endif %}; + proxy_set_header Host {% if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}{%- endif %}; proxy_hide_header x-amz-id-2; proxy_hide_header x-amz-request-id; proxy_hide_header x-amz-meta-server-side-encryption; @@ -24,7 +24,7 @@ metadata: proxy_intercept_errors on; add_header Cache-Control max-age=31536000; rewrite /scorm-proxy(.*) $1 break; - proxy_pass https://{%- if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.s3.amazonaws.com{%- endif %}; + proxy_pass https://{%- if MINIO_HOST is defined %}{{ MINIO_HOST }}{% else %}{{ S3_STORAGE_BUCKET }}.{{ S3_HOST or 's3.amazonaws.com' }}{%- endif %}; } {%- endif %} spec: