diff --git a/app-infrastructure/configs/banner_config.json b/app-infrastructure/configs/banner_config.json new file mode 100644 index 00000000..8841d2a7 --- /dev/null +++ b/app-infrastructure/configs/banner_config.json @@ -0,0 +1,20 @@ +{ + "bannerConfiguration": [ + { + "text": "Because of a lapse in government funding, the information on this website may not be up to date, transactions submitted via the website may not be processed, and the agency may not be able to respond to inquiries until appropriations are enacted.
The NIH Clinical Center (the research hospital of NIH) is open. For more details about its operating status, please visit cc.nih.gov.
Updates regarding government operating status and resumption of normal operations can be found at OPM.gov.", + "startDate": "2023-09-29T00:00:00Z", + "endDate": "2024-09-29T00:00:00Z", + "styles": "background-color: #C0143C; color: #fff; font-size: 1.1em; padding: 10px;", + "isDismissible": false, + "disabled": true + }, + { + "text": "Open PIC-SURE without login is now live! Users can search, query, and build cohorts using data in BDC, with no login required. Check out this new feature here.
The “Open Access” tab will no longer be accessible from this site starting December 2023. Please use the Open PIC-SURE site to continue using the Open Access functionality.", + "startDate": "2023-11-01T00:00:00Z", + "endDate": "2024-12-23T00:00:00Z", + "styles": "background-color: #1a568c; color: #fff; font-size: 1.1em; padding: 10px;", + "isDismissible": true, + "disabled": false + } + ] +} \ No newline at end of file diff --git a/app-infrastructure/s3_roles.tf b/app-infrastructure/s3_roles.tf index b9f27428..a5eb19e3 100644 --- a/app-infrastructure/s3_roles.tf +++ b/app-infrastructure/s3_roles.tf @@ -189,6 +189,13 @@ resource "aws_iam_role_policy" "httpd-deployment-s3-policy" { "Effect": "Allow", "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/picsureui_settings.json" },{ + "Action": [ + "s3:GetObject" + ], + "Effect": "Allow", + "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/banner_config.json" + }, + { "Action": [ "s3:GetObject" ], diff --git a/app-infrastructure/scripts/httpd-user_data.sh b/app-infrastructure/scripts/httpd-user_data.sh index d7d940da..c6a66cca 100644 --- a/app-infrastructure/scripts/httpd-user_data.sh +++ b/app-infrastructure/scripts/httpd-user_data.sh @@ -32,6 +32,7 @@ s3_copy s3://${stack_s3_bucket}/releases/jenkins_pipeline_build_${stack_githash} s3_copy s3://${stack_s3_bucket}/configs/jenkins_pipeline_build_${stack_githash}/httpd-vhosts.conf /usr/local/docker-config/httpd-vhosts.conf s3_copy s3://${stack_s3_bucket}/certs/httpd/ /usr/local/docker-config/cert/ --recursive s3_copy s3://${stack_s3_bucket}/configs/jenkins_pipeline_build_${stack_githash}/picsureui_settings.json /usr/local/docker-config/picsureui_settings.json +s3_copy s3://${stack_s3_bucket}/configs/jenkins_pipeline_build_${stack_githash}/banner_config.json /usr/local/docker-config/banner_config.json s3_copy s3://${stack_s3_bucket}/data/${dataset_s3_object_key}/fence_mapping.json /home/centos/fence_mapping.json for i in 1 2 3 4 5; do echo "confirming wildfly resolvable" && sudo curl --connect-timeout 1 $(grep -A30 preprod /usr/local/docker-config/httpd-vhosts.conf | grep wildfly | grep api | cut -d "\"" -f 2 | sed 's/pic-sure-api-2.*//') || if [ $? = 6 ]; then (exit 1); fi && break || sleep 60; done @@ -44,6 +45,7 @@ sudo docker run --name=httpd \ --log-driver syslog --log-opt tag=httpd \ -v /var/log/httpd-docker-logs/:/usr/local/apache2/logs/ \ -v /usr/local/docker-config/picsureui_settings.json:/usr/local/apache2/htdocs/picsureui/settings/settings.json \ + -v /usr/local/docker-config/banner_config.json:/usr/local/apache2/htdocs/picsureui/settings/banner_config.json \ -v /home/centos/fence_mapping.json:/usr/local/apache2/htdocs/picsureui/studyAccess/studies-data.json \ -v /usr/local/docker-config/cert:/usr/local/apache2/cert/ \ -v /usr/local/docker-config/httpd-vhosts.conf:/usr/local/apache2/conf/extra/httpd-vhosts.conf \ diff --git a/s3-deployment-roles/s3_roles.tf b/s3-deployment-roles/s3_roles.tf index 2694a618..0a027d1d 100644 --- a/s3-deployment-roles/s3_roles.tf +++ b/s3-deployment-roles/s3_roles.tf @@ -227,6 +227,12 @@ resource "aws_iam_role_policy" "httpd-deployment-s3-policy" { ], "Effect": "Allow", "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/picsureui_settings.json" + },{ + "Action": [ + "s3:GetObject" + ], + "Effect": "Allow", + "Resource": "arn:aws:s3:::${var.stack_s3_bucket}/configs/jenkins_pipeline_build_${var.stack_githash_long}/banner_config.json" },{ "Action": [ "s3:GetObject"