Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VOTE-3126: add sso assertion certs #1113

Merged
merged 1 commit into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ default_config: &defaults
no_proxy: ${no_proxy}
PHP_INI_SCAN_DIR: /home/vcap/app/php/etc/:/home/vcap/app/php/etc/php.ini.d/
sso_x509_cert: ${sso_x509_cert}
sso_assertion_cert: |
${sso_assertion_cert}
sso_assertion_key: |
${sso_assertion_key}
waf_external_endpoint: ${waf_external_endpoint}
timeout: 180
routes:
Expand Down
2 changes: 1 addition & 1 deletion scripts/pipeline/cloud-gov-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ envsubst < manifest.tmp > manifest.yml
space=${CIRCLE_BRANCH}
[ "${CIRCLE_BRANCH}" = "test" ] && space="dev"

cf push --strategy rolling
cf push --strategy rolling >/dev/null 2>&1

cf add-network-policy ${project}-drupal-${CIRCLE_BRANCH} ${proxy_name} -s ${proxy_space} --protocol tcp --port ${proxy_port}
cf add-network-policy ${waf_name} ${project}-drupal-${CIRCLE_BRANCH} -s "${project}-${space}" --protocol tcp --port ${drupal_port}
8 changes: 8 additions & 0 deletions scripts/pipeline/exports.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ if [ "${cf_env}" == "prod" ]; then
export drupal_memory=${prod_drupal_memory}
export ssg_uri=${prod_ssg_uri}
export sso_x509_cert=${prod_sso_x509_cert}
export sso_assertion_cert=${prod_sso_assertion_cert}
export sso_assertion_key=${prod_sso_assertion_key}
export waf_name=${prod_waf_name}
export waf_external_endpoint=${prod_waf_external_endpoint}
elif [ "${cf_env}" == "stage" ]; then
Expand All @@ -19,6 +21,8 @@ elif [ "${cf_env}" == "stage" ]; then
export drupal_memory=${stage_drupal_memory}
export ssg_uri=${stage_ssg_uri}
export sso_x509_cert=${stage_sso_x509_cert}
export sso_assertion_cert=${stage_sso_assertion_cert}
export sso_assertion_key=${stage_sso_assertion_key}
export waf_name=${stage_waf_name}
export waf_external_endpoint=${stage_waf_external_endpoint}
elif [ "${cf_env}" == "test" ]; then
Expand All @@ -28,6 +32,8 @@ elif [ "${cf_env}" == "test" ]; then
export drupal_instances=${test_drupal_instances}
export ssg_uri=${test_ssg_uri}
export sso_x509_cert=${test_sso_x509_cert}
export sso_assertion_cert=${test_sso_assertion_cert}
export sso_assertion_key=${test_sso_assertion_key}
export waf_name=${test_waf_name}
export waf_external_endpoint=${test_waf_external_endpoint}
export composer_no_dev=0
Expand All @@ -38,6 +44,8 @@ elif [ "${cf_env}" == "dev" ]; then
export drupal_memory=${dev_drupal_memory}
export ssg_uri=${dev_ssg_uri}
export sso_x509_cert=${dev_sso_x509_cert}
export sso_assertion_cert=${dev_sso_assertion_cert}
export sso_assertion_key=${dev_sso_assertion_key}
export waf_name=${dev_waf_name}
export waf_external_endpoint=${dev_waf_external_endpoint}
export composer_no_dev=0
Expand Down