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
2 changes: 1 addition & 1 deletion proxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ map different paths to different apps (containers).

`nginx.montagu.conf` contains references to an X509 certificate and a private
key, which it expects at `/etc/montagu/proxy/certificate.pem` and
`/etc/montagu/proxy/ssl_key.pem`, respectively. The `/etc/montagu/proxy`
`/etc/montagu/proxy/key.pem`, respectively. The `/etc/montagu/proxy`
directory can be mounted from a volume providing these certificates, or they
can be injected into the container using `docker copy`.

Expand Down
2 changes: 1 addition & 1 deletion proxy/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if [[ ! -f $root/certificate.pem ]]; then
openssl req -quiet -x509 -newkey rsa:2048 \
-sha256 -days 365 -noenc \
-subj "/C=GB/L=Location/O=Vaccine Impact Modelling Consortium/OU=Montagu/CN=$host" \
-keyout "$root/ssl_key.pem" -out "$root/certificate.pem"
-keyout "$root/key.pem" -out "$root/certificate.pem"
fi

echo "Starting nginx"
Expand Down
2 changes: 1 addition & 1 deletion proxy/nginx.montagu.conf
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ server {
add_header Permissions-Policy "accelerometer=(), camera=(), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), payment=(), usb=(), interest-cohort=()" always;

ssl_certificate /etc/montagu/proxy/certificate.pem;
ssl_certificate_key /etc/montagu/proxy/ssl_key.pem;
ssl_certificate_key /etc/montagu/proxy/key.pem;

# SSL settings as recommended by https://ssl-config.mozilla.org
ssl_protocols TLSv1.2 TLSv1.3;
Expand Down
Loading