Merge pull request #405 from openstax/update-rds-ca-cert

DISCO-151 Updated the RDS CA cert
openstax · Jul 26, 2024 · 242eb89 · 242eb89
2 parents 6686b97 + 696f711
commit 242eb89
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
@@ -5,8 +5,6 @@ on:
   push:
     branches:
       - main
-  schedule:
-    - cron: '0 0 * * 0' # weekly
 
 jobs:
   assets:
@@ -15,7 +13,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
       # Get OS version - https://github.com/actions/cache/issues/543
@@ -28,7 +26,7 @@ jobs:
             ${{ runner.os }}-${{ env.OS_VERSION }}-gems-pr-
       - name: Build assets
         run: |
-          gem install bundler
+          gem install bundler -v 2.4.22
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
           bundle exec rake assets:precompile
diff --git a/.github/workflows/migrations.yml b/.github/workflows/migrations.yml
@@ -45,7 +45,7 @@ jobs:
       - run: git checkout HEAD^
 
       # Install ruby
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
 
@@ -65,7 +65,7 @@ jobs:
           OXE_DB_USER: postgres
           OXE_DB_PASS: postgres
         run: |
-          gem install bundler
+          gem install bundler -v 2.4.22
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
           bundle exec rake db:create db:schema:load db:seed --trace

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,8 +5,6 @@ on:
   push:
     branches:
       - main
-  schedule:
-    - cron: '0 0 * * 0' # weekly
 
 jobs:
   tests:
@@ -24,7 +22,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
       # Get OS version - https://github.com/actions/cache/issues/543
@@ -42,7 +40,7 @@ jobs:
           OXE_DB_PASS: postgres
           RAILS_ENV: test
         run: |
-          gem install bundler
+          gem install bundler -v 2.4.22
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
           bundle exec rake parallel:create parallel:load_schema parallel:seed --trace

diff --git a/config/database.yml b/config/database.yml
@@ -30,4 +30,4 @@ production:
   database: <%= ENV['RDS_DATABASE'] %>
   pool: <%= ENV['RAILS_MAX_THREADS'] %>
   sslmode: verify-full
-  sslrootcert: /etc/ssl/certs/rds.pem
+  sslrootcert: /etc/ssl/certs/rds-bundle.pem