Skip to content

Commit

Permalink
Merge pull request #33 from aws-samples/check-issues
Browse files Browse the repository at this point in the history
fixing secrets for task definitions, minor issues with apt in userdat…
  • Loading branch information
couchgott authored Oct 27, 2020
2 parents 7259e24 + ad28d14 commit 4d30f59
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 23 deletions.
3 changes: 1 addition & 2 deletions templates/bbb-on-aws-bbbappscalable.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions templates/bbb-on-aws-bbbappsingle.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions templates/bbb-on-aws-bbbturn.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 17 additions & 17 deletions templates/bbb-on-aws-frontendapps.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4d30f59

Please sign in to comment.