From 67e1cf6849aa1903a441ce5f693e7f3120dd6931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= Date: Wed, 2 Jun 2021 15:38:23 +0300 Subject: [PATCH] Remove /var/lib/certidude prefix for paths --- Dockerfile | 4 ++-- entrypoint.sh | 2 +- nginx.conf | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1fe54fc..520d538 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM alpine as build -MAINTAINER lauri +FROM alpine +MAINTAINER Pinecrypt Labs RUN apk add --update npm nginx rsync bash RUN npm install --silent --no-optional -g nunjucks@2.5.2 nunjucks-date@1.2.0 node-forge bootstrap@4.0.0-alpha.6 jquery timeago tether font-awesome qrcode-svg xterm COPY nginx.conf /etc/nginx/nginx.conf diff --git a/entrypoint.sh b/entrypoint.sh index 65af0a0..b5b2277 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,5 +1,5 @@ #!/bin/sh -while [ ! -f /var/lib/certidude/server-secrets/self_cert.pem ]; do +while [ ! -f /server-secrets/self_cert.pem ]; do sleep 1 done exec nginx -g "daemon off; error_log /dev/stdout info;" diff --git a/nginx.conf b/nginx.conf index 86a62c2..128439a 100644 --- a/nginx.conf +++ b/nginx.conf @@ -62,8 +62,8 @@ http { send_timeout 600; # To use CA-s own certificate for frontend and mutually authenticated connections - ssl_certificate /var/lib/certidude/server-secrets/self_cert.pem; - ssl_certificate_key /var/lib/certidude/server-secrets/self_key.pem; + ssl_certificate /server-secrets/self_cert.pem; + ssl_certificate_key /server-secrets/self_key.pem; server { # Section for serving insecure HTTP, note that this is suitable for @@ -145,7 +145,7 @@ http { # Allow client authentication with certificate, # backend must still check if certificate was used for TLS handshake ssl_verify_client optional; - ssl_client_certificate /var/lib/certidude/server-secrets/ca_cert.pem; + ssl_client_certificate /server-secrets/ca_cert.pem; # Proxy pass to backend location /api/ {