Skip to content
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
18 changes: 11 additions & 7 deletions production/montagu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ volumes:
static: montagu_static_volume
static_logs: montagu_static_logs
mq: montagu_mq
acme-challenge: montagu_acme_challenge
certificates: montagu_certificates
certbot: montagu_certbot
montagu-tls: montagu-tls

api:
name: montagu-api
Expand Down Expand Up @@ -92,10 +90,16 @@ proxy:
repo: nginx
name: nginx-prometheus-exporter
tag: 1.3.0
acme:
email: [email protected]
additional_domains:
- production2.montagu.dide.ic.ac.uk
acme_buddy:
image:
repo: ghcr.io/reside-ic
name: acme-buddy
tag: main
email: [email protected]
dns_provider: cloudflare
env:
CF_DNS_API_TOKEN: VAULT:secret/vimc/ssl/v2/cloudflare:CFG_DNS_API_TOKEN
port: 2112
contrib:
name: montagu-contrib-portal
tag: main
Expand Down
7 changes: 4 additions & 3 deletions production/packit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ packit:
# Location that is allowed to make the request
# https://dietcode.io/p/cors/
cors_allowed_origins: "https://montagu.vaccineimpact.org"
runner:
git:
url: [email protected]:vimc/montagu-reports.git
ssh: VAULT:secret/vimc/reports/deploy:private

brand:
# Paths are interpreted relative to this configuration file, so
Expand All @@ -60,9 +64,6 @@ orderly-runner:
image:
name: orderly.runner
tag: main
git:
url: [email protected]:vimc/montagu-reports.git
ssh: VAULT:secret/vimc/reports/deploy:private
workers: 1
env:
MONTAGU_DB_DEFAULT_INSTANCE: production
Expand Down
16 changes: 12 additions & 4 deletions science/montagu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ volumes:
static: montagu_static_volume
static_logs: montagu_static_logs
mq: montagu_mq
montagu-tls: montagu-tls

api:
name: montagu-api
Expand Down Expand Up @@ -80,10 +81,17 @@ proxy:
repo: nginx
name: nginx-prometheus-exporter
tag: 0.10.0
ssl:
key: VAULT:secret/vimc/ssl/v2/science/key:value
certificate: VAULT:secret/vimc/ssl/v2/science/cert:value
dhparam: VAULT:secret/vimc/ssl/v2/science/dhparam:value
acme_buddy:
image:
repo: ghcr.io/reside-ic
name: acme-buddy
tag: main
dns_provider: hdb
email: [email protected]
env:
HDB_ACME_USERNAME: VAULT:secret/certbot-hdb/credentials:username
HDB_ACME_PASSWORD: VAULT:secret/certbot-hdb/credentials:password
port: 2112
contrib:
name: montagu-contrib-portal
tag: main
Expand Down
7 changes: 4 additions & 3 deletions science/packit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ packit:
# Location that is allowed to make the request
# https://dietcode.io/p/cors/
cors_allowed_origins: "https://science.montagu.dide.ic.ac.uk"
runner:
git:
url: [email protected]:vimc/montagu-reports.git
ssh: VAULT:secret/vimc/reports/deploy:private

brand:
# Paths are interpreted relative to this configuration file, so
Expand All @@ -61,9 +65,6 @@ orderly-runner:
image:
name: orderly.runner
tag: main
git:
url: [email protected]:vimc/montagu-reports.git
ssh: VAULT:secret/vimc/reports/deploy:private
workers: 1
env:
MONTAGU_DB_DEFAULT_INSTANCE: science
Expand Down
16 changes: 12 additions & 4 deletions uat/montagu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ volumes:
static: montagu_static_volume
static_logs: montagu_static_logs
mq: montagu_mq
montagu-tls: montagu-tls

api:
name: montagu-api
Expand Down Expand Up @@ -81,10 +82,17 @@ proxy:
repo: nginx
name: nginx-prometheus-exporter
tag: 0.10.0
ssl:
key: VAULT:secret/vimc/ssl/v2/uat/key:value
certificate: VAULT:secret/vimc/ssl/v2/uat/cert:value
dhparam: VAULT:secret/vimc/ssl/v2/uat/dhparam:value
acme_buddy:
image:
repo: ghcr.io/reside-ic
name: acme-buddy
tag: main
dns_provider: hdb
email: [email protected]
env:
HDB_ACME_USERNAME: VAULT:secret/certbot-hdb/credentials:username
HDB_ACME_PASSWORD: VAULT:secret/certbot-hdb/credentials:password
port: 2112
contrib:
name: montagu-contrib-portal
tag: main
Expand Down
7 changes: 4 additions & 3 deletions uat/packit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ packit:
# Location that is allowed to make the request
# https://dietcode.io/p/cors/
cors_allowed_origins: "https://uat.montagu.dide.ic.ac.uk"
runner:
git:
url: [email protected]:vimc/montagu-reports.git
ssh: VAULT:secret/vimc/reports/deploy:private

brand:
# Paths are interpreted relative to this configuration file, so
Expand All @@ -61,9 +65,6 @@ orderly-runner:
image:
name: orderly.runner
tag: main
git:
url: [email protected]:vimc/montagu-reports.git
ssh: VAULT:secret/vimc/reports/deploy:private
workers: 1
env:
MONTAGU_DB_DEFAULT_INSTANCE: uat
Expand Down