From ad28d1420c8caaeeba9b8c3d050cd8c4ac86bdf3 Mon Sep 17 00:00:00 2001 From: David Surey Date: Tue, 27 Oct 2020 18:40:44 +0100 Subject: [PATCH] fixing secrets for task definitions, minor issues with apt in userdata fixed --- .../bbb-on-aws-bbbappscalable.template.yaml | 3 +- .../bbb-on-aws-bbbappsingle.template.yaml | 3 +- templates/bbb-on-aws-bbbturn.template.yaml | 3 +- .../bbb-on-aws-frontendapps.template.yaml | 34 +++++++++---------- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/templates/bbb-on-aws-bbbappscalable.template.yaml b/templates/bbb-on-aws-bbbappscalable.template.yaml index 5a70898..278b57d 100644 --- a/templates/bbb-on-aws-bbbappscalable.template.yaml +++ b/templates/bbb-on-aws-bbbappscalable.template.yaml @@ -348,8 +348,7 @@ Resources: UserData: Fn::Base64: !Sub | #!/bin/bash -xe - apt update -y - DEBIAN_FRONTEND='noninteractive' apt -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' full-upgrade + apt update -y && DEBIAN_FRONTEND='noninteractive' apt -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' full-upgrade apt autoremove -y apt clean diff --git a/templates/bbb-on-aws-bbbappsingle.template.yaml b/templates/bbb-on-aws-bbbappsingle.template.yaml index 174d737..6ae7c7f 100644 --- a/templates/bbb-on-aws-bbbappsingle.template.yaml +++ b/templates/bbb-on-aws-bbbappsingle.template.yaml @@ -325,8 +325,7 @@ Resources: UserData: Fn::Base64: !Sub | #!/bin/bash -xe - apt update -y - DEBIAN_FRONTEND='noninteractive' apt -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' full-upgrade + apt update -y && DEBIAN_FRONTEND='noninteractive' apt -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' full-upgrade apt autoremove -y apt clean diff --git a/templates/bbb-on-aws-bbbturn.template.yaml b/templates/bbb-on-aws-bbbturn.template.yaml index b6d270b..ff7e324 100644 --- a/templates/bbb-on-aws-bbbturn.template.yaml +++ b/templates/bbb-on-aws-bbbturn.template.yaml @@ -260,8 +260,7 @@ Resources: UserData: Fn::Base64: !Sub | #!/bin/bash -xe - apt update -y - DEBIAN_FRONTEND='noninteractive' apt -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' full-upgrade + apt update -y && DEBIAN_FRONTEND='noninteractive' apt -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' full-upgrade apt autoremove -y apt clean diff --git a/templates/bbb-on-aws-frontendapps.template.yaml b/templates/bbb-on-aws-frontendapps.template.yaml index d8159ad..366c6f6 100644 --- a/templates/bbb-on-aws-frontendapps.template.yaml +++ b/templates/bbb-on-aws-frontendapps.template.yaml @@ -576,19 +576,19 @@ Resources: - -c - /usr/local/bin/bundle exec rake db:migrate; /usr/local/bin/bundle exec rake user:create["bbbadmin","${ADMIN_LOGIN}","${ADMIN_PASSWORD}","admin"]; bin/start Secrets: - - name: ADMIN_PASSWORD + - Name: ADMIN_PASSWORD ValueFrom: !Sub "${BBBAdministratorlogin}:password::" - - name: SECRET_KEY_BASE + - Name: SECRET_KEY_BASE ValueFrom: !Sub "${BBBApplicationBaseSecret}:basekeyvalue::" - - name: BIGBLUEBUTTON_SECRET + - Name: BIGBLUEBUTTON_SECRET ValueFrom: !Sub "${BBBLoadbalancerSecret}:basekeyvalue::" - - name: DB_PASSWORD + - Name: DB_PASSWORD ValueFrom: !Sub "${BBBRDSDBSecret}:password::" - - name: SMTP_PASSWORD + - Name: SMTP_PASSWORD ValueFrom: !Sub "${BBBSMTPAccessSecret}:smtppassword::" - - name: DB_USERNAME + - Name: DB_USERNAME ValueFrom: !Sub "${BBBRDSDBSecret}:username::" - - name: SMTP_USERNAME + - Name: SMTP_USERNAME ValueFrom: !Sub "${BBBSMTPAccessSecret}:smtpusername::" Environment: - Name: ADMIN_LOGIN @@ -724,9 +724,9 @@ Resources: - CMD-SHELL - exit 0 Secrets: - - name: SECRET_KEY_BASE + - Name: SECRET_KEY_BASE ValueFrom: !Sub "${BBBApplicationBaseSecret}:basekeyvalue::" - - name: LOADBALANCER_SECRET + - Name: LOADBALANCER_SECRET ValueFrom: !Sub "${BBBLoadbalancerSecret}:basekeyvalue::" Environment: - Name: DATABASE_URL @@ -757,9 +757,9 @@ Resources: - CMD-SHELL - exit 0 Secrets: - - name: SECRET_KEY_BASE + - Name: SECRET_KEY_BASE ValueFrom: !Sub "${BBBApplicationBaseSecret}:basekeyvalue::" - - name: LOADBALANCER_SECRET + - Name: LOADBALANCER_SECRET ValueFrom: !Sub "${BBBLoadbalancerSecret}:basekeyvalue::" Environment: - Name: DATABASE_URL @@ -803,9 +803,9 @@ Resources: - CMD-SHELL - exit 0 Secrets: - - name: SECRET_KEY_BASE + - Name: SECRET_KEY_BASE ValueFrom: !Sub "${BBBApplicationBaseSecret}:basekeyvalue::" - - name: LOADBALANCER_SECRET + - Name: LOADBALANCER_SECRET ValueFrom: !Sub "${BBBLoadbalancerSecret}:basekeyvalue::" Environment: - Name: DATABASE_URL @@ -849,9 +849,9 @@ Resources: - CMD-SHELL - exit 0 Secrets: - - name: SECRET_KEY_BASE + - Name: SECRET_KEY_BASE ValueFrom: !Sub "${BBBApplicationBaseSecret}:basekeyvalue::" - - name: LOADBALANCER_SECRET + - Name: LOADBALANCER_SECRET ValueFrom: !Sub "${BBBLoadbalancerSecret}:basekeyvalue::" Environment: - Name: DATABASE_URL @@ -889,9 +889,9 @@ Resources: - CMD-SHELL - exit 0 Secrets: - - name: SECRET_KEY_BASE + - Name: SECRET_KEY_BASE ValueFrom: !Sub "${BBBApplicationBaseSecret}:basekeyvalue::" - - name: LOADBALANCER_SECRET + - Name: LOADBALANCER_SECRET ValueFrom: !Sub "${BBBLoadbalancerSecret}:basekeyvalue::" Environment: - Name: DATABASE_URL