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.

Sign up for GitHub

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

Jump to bottom

bacpop-150 Staging config #4

Merged
merged 6 commits into from
Feb 22, 2024
Merged

bacpop-150 Staging config #4

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d03ba42
staging config
EmmaLRussell Feb 8, 2024
679bdb2
update ssl values
EmmaLRussell Feb 16, 2024
d22be37
Merge branch 'bacpop-143' into bacpop-150
EmmaLRussell Feb 20, 2024
b504206
run on all push
EmmaLRussell Feb 20, 2024
046c28c
Merge branch 'main' into bacpop-150
EmmaLRussell Feb 22, 2024
bb6a0e4
specify push and pr branches
EmmaLRussell Feb 22, 2024
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
10 changes: 1 addition & 9 deletions .github/workflows/Pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
on:
push:
branches:
- main
- master
pull_request:
branches:
- main
- master
on: push

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this change for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't building this branch as targeting bacpop-143..

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

on:
  push:
    branches:
      - main
      - master
      - "bacpop-*"
  pull_request:
    branches:
      - main
      - master
      - "bacpop-*"

I set this pattern up in mcstate2 and it's working well (mrc-ide/monty@d267d0e)

name: Tests

Expand Down
4 changes: 2 additions & 2 deletions config/prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
proxy:
host: beebop.dide.ic.ac.uk
ssl:
certificate: VAULT:secret/beebop/ssl:cert
key: VAULT:secret/beebop/ssl:key
certificate: VAULT:secret/beebop/ssl/production:cert
key: VAULT:secret/beebop/ssl/production:key
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've added an additional level to keep ssl values for different servers (production and staging).

server:
client_url: https://beebop.dide.ic.ac.uk
server_url: https://beebop.dide.ic.ac.uk/api
Expand Down
20 changes: 20 additions & 0 deletions config/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
proxy:
host: beebop-dev.dide.ic.ac.uk
ssl:
certificate: VAULT:secret/beebop/ssl/staging:cert
key: VAULT:secret/beebop/ssl/staging:key
server:
client_url: https://beebop-dev.dide.ic.ac.uk
server_url: https://beebop-dev.dide.ic.ac.uk/api
auth:
google:
client_id: VAULT:secret/beebop/auth/staging/google:clientid
secret: VAULT:secret/beebop/auth/staging/google:secret
session_secret: VAULT:secret/beebop/express-session:secret
github:
client_id: VAULT:secret/beebop/auth/staging/github:clientid
secret: VAULT:secret/beebop/auth/staging/github:secret
vault:
addr: https://vault.dide.ic.ac.uk:8200
auth:
method: github
Loading