From 92f53d6a690e608d2678090b7c469e5dfba25db1 Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Wed, 18 Sep 2024 11:19:27 -0400 Subject: [PATCH] put these in a block and only invoke NavConfig on test and prod --- .../apps/dashboard/initializers/ood.rb | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/ondemand.osc.edu/apps/dashboard/initializers/ood.rb b/ondemand.osc.edu/apps/dashboard/initializers/ood.rb index c8e694a..d08b115 100644 --- a/ondemand.osc.edu/apps/dashboard/initializers/ood.rb +++ b/ondemand.osc.edu/apps/dashboard/initializers/ood.rb @@ -16,18 +16,19 @@ def add_paths fs_outage = `grep node_file_test_failure /var/lib/node_exporter/textfile_collector/autofs-file-test.prom | grep -q ' 1'; echo $?` add_paths if fs_outage.chomp == "1" && !File.exist?('/etc/ood/config/gpfs_outage') - NavConfig.categories_whitelist=true -end + require 'socket' + hostname = Socket.gethostname + case hostname + when /dev/ + idp = 'https://idp-dev.osc.edu' + when /test/ + idp = 'https://idp-test.osc.edu' + NavConfig.categories_whitelist=true # TODO: need to remove when upgrading to 4.0 + else + idp = 'https://idp.osc.edu' + NavConfig.categories_whitelist=true # TODO: need to remove when upgrading to 4.0 + end -require 'socket' -hostname = Socket.gethostname -case hostname -when /dev/ - idp = 'https://idp-dev.osc.edu' -when /test/ - idp = 'https://idp-test.osc.edu' -else - idp = 'https://idp.osc.edu' + ENV['OOD_DASHBOARD_HELP_CUSTOM_URL'] = "#{idp}/realms/osc/account/#/security/linked-accounts" end -ENV['OOD_DASHBOARD_HELP_CUSTOM_URL'] = "#{idp}/realms/osc/account/#/security/linked-accounts" \ No newline at end of file