Additional configuration for server and prepare for deployment

This commit is contained in:
2020-12-13 23:08:24 +00:00
parent 2df38382bb
commit 8629648666
4 changed files with 100 additions and 55 deletions

View File

@@ -1,9 +1,9 @@
# Options for building certificates
x-certs: &certs
image: paulczar/omgwtfssl
restart: "no"
volumes:
- certs:/certs
#x-certs: &certs
# image: paulczar/omgwtfssl
# restart: "no"
# volumes:
# - certs:/certs
version: "3.4"
@@ -171,7 +171,7 @@ services:
image: nginx:alpine
restart: always
volumes:
- certs:/etc/nginx/certs:ro
- /opt/ssl:/etc/nginx/certs:ro
- ./nginx.conf:/etc/nginx/nginx.conf
- monica-public:/var/www/html/monica/public:ro
- monica-data:/var/www/html/monica/storage:ro
@@ -184,21 +184,20 @@ services:
- collabora
- cadvisor
- pinry
- certs
ports:
- 80:80
- 443:443
networks:
- nginx
certs:
<<: *certs
environment:
- SSL_SUBJECT=${DOMAIN}
- CA_SUBJECT=chris@${DOMAIN}
- SSL_KEY=/certs/${DOMAIN}.key
- SSL_CSR=/certs/${DOMAIN}.csr
- SSL_CERT=/certs/${DOMAIN}.crt
#certs:
# <<: *certs
# environment:
# - SSL_SUBJECT=${DOMAIN}
# - CA_SUBJECT=chris@${DOMAIN}
# - SSL_KEY=/certs/${DOMAIN}.key
# - SSL_CSR=/certs/${DOMAIN}.csr
# - SSL_CERT=/certs/${DOMAIN}.crt
volumes:
db:
@@ -206,7 +205,7 @@ volumes:
monica-public:
monica-data:
nextcloud:
certs:
#certs:
dashboard:
pinry: