From 751b97c5d41d8ee17410ea1ba0518018c495c4e1 Mon Sep 17 00:00:00 2001 From: Kirk Wang Date: Tue, 9 Jan 2024 14:43:06 -0800 Subject: [PATCH] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Change=20ENV=20var=20name?= =?UTF-8?q?=20to=20be=20more=20descriptive?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- app/helpers/hyku_helper.rb | 2 +- ops/demo-deploy.tmpl.yaml | 2 +- ops/iiif-deploy.tmpl.yaml | 2 +- ops/iiif.tmpl.yaml | 2 +- ops/review-deploy.tmpl.yaml | 2 +- ops/staging-deploy.tmpl.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env b/.env index e316ce68b..4694ca3da 100644 --- a/.env +++ b/.env @@ -70,4 +70,4 @@ HYRAX_ANALYTICS=false # When set to false, this turns off turbolinks which allows for # redirects from AF works to Valyrie works in the edit and show -TURBOLINKS_FOR_VALKYRIE=false +HYKU_ALLOW_REDIRECT_TO_VALKYRIE_RESOURCE=false diff --git a/app/helpers/hyku_helper.rb b/app/helpers/hyku_helper.rb index f7c27a689..f8a034b95 100644 --- a/app/helpers/hyku_helper.rb +++ b/app/helpers/hyku_helper.rb @@ -21,6 +21,6 @@ def admin_only_tenant_creation? end def turbolinks_enabled? - ActiveModel::Type::Boolean.new.cast(ENV.fetch('TURBOLINKS_FOR_VALKYRIE', true)) + ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYKU_ALLOW_REDIRECT_TO_VALKYRIE_RESOURCE', true)) end end diff --git a/ops/demo-deploy.tmpl.yaml b/ops/demo-deploy.tmpl.yaml index 94f0d6108..1657cf736 100644 --- a/ops/demo-deploy.tmpl.yaml +++ b/ops/demo-deploy.tmpl.yaml @@ -168,7 +168,7 @@ extraEnvVars: &envVars value: $SENTRY_DSN - name: SENTRY_ENVIRONMENT value: $SENTRY_ENVIRONMENT - - name: TURBOLINKS_FOR_VALKYRIE + - name: HYKU_ALLOW_REDIRECT_TO_VALKYRIE_RESOURCE value: "false" worker: replicaCount: 1 diff --git a/ops/iiif-deploy.tmpl.yaml b/ops/iiif-deploy.tmpl.yaml index 866d8d664..6f16376ad 100644 --- a/ops/iiif-deploy.tmpl.yaml +++ b/ops/iiif-deploy.tmpl.yaml @@ -168,7 +168,7 @@ extraEnvVars: &envVars value: $SENTRY_DSN - name: SENTRY_ENVIRONMENT value: $SENTRY_ENVIRONMENT - - name: TURBOLINKS_FOR_VALKYRIE + - name: HYKU_ALLOW_REDIRECT_TO_VALKYRIE_RESOURCE value: "false" worker: diff --git a/ops/iiif.tmpl.yaml b/ops/iiif.tmpl.yaml index b2182c819..b94a2f48a 100644 --- a/ops/iiif.tmpl.yaml +++ b/ops/iiif.tmpl.yaml @@ -164,7 +164,7 @@ extraEnvVars: &envVars value: $SECRET_KEY_BASE - name: SENTRY_DSN value: $SENTRY_DSN - - name: TURBOLINKS_FOR_VALKYRIE + - name: HYKU_ALLOW_REDIRECT_TO_VALKYRIE_RESOURCE value: "false" worker: diff --git a/ops/review-deploy.tmpl.yaml b/ops/review-deploy.tmpl.yaml index 9fd73d38d..c50aa7c26 100644 --- a/ops/review-deploy.tmpl.yaml +++ b/ops/review-deploy.tmpl.yaml @@ -122,7 +122,7 @@ extraEnvVars: &envVars value: hyrax - name: SOLR_CONFIGSET_NAME value: $CI_COMMIT_SHORT_SHA - - name: TURBOLINKS_FOR_VALKYRIE + - name: HYKU_ALLOW_REDIRECT_TO_VALKYRIE_RESOURCE value: "false" worker: diff --git a/ops/staging-deploy.tmpl.yaml b/ops/staging-deploy.tmpl.yaml index 30a49e6c6..725757439 100644 --- a/ops/staging-deploy.tmpl.yaml +++ b/ops/staging-deploy.tmpl.yaml @@ -170,7 +170,7 @@ extraEnvVars: &envVars value: $SENTRY_DSN - name: SENTRY_ENVIRONMENT value: $SENTRY_ENVIRONMENT - - name: TURBOLINKS_FOR_VALKYRIE + - name: HYKU_ALLOW_REDIRECT_TO_VALKYRIE_RESOURCE value: "false" worker: