diff --git a/proxy/README.md b/proxy/README.md index c9540d5e9..683b70900 100644 --- a/proxy/README.md +++ b/proxy/README.md @@ -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`. diff --git a/proxy/entrypoint.sh b/proxy/entrypoint.sh index 1dc0b5c3c..c2727b22c 100755 --- a/proxy/entrypoint.sh +++ b/proxy/entrypoint.sh @@ -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" diff --git a/proxy/nginx.montagu.conf b/proxy/nginx.montagu.conf index 0c71751af..d4959021a 100644 --- a/proxy/nginx.montagu.conf +++ b/proxy/nginx.montagu.conf @@ -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;