diff --git a/conf.d/lac-elog.conf b/conf.d/lac-elog.conf new file mode 100644 index 0000000..b0ff725 --- /dev/null +++ b/conf.d/lac-elog.conf @@ -0,0 +1,28 @@ +server { + listen 80; + server_name lac-elog.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name lac-elog.psi.ch; + + client_max_body_size 64M; + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 4096; + + ssl_certificate /etc/nginx/certs/lac-elog.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/lac-elog.psi.ch.key; + + location / { + proxy_pass https://lac-elog:8080; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } +} diff --git a/conf.d/lmx-elog.conf b/conf.d/lmx-elog.conf new file mode 100644 index 0000000..88cd9b1 --- /dev/null +++ b/conf.d/lmx-elog.conf @@ -0,0 +1,28 @@ +server { + listen 80; + server_name lmx-elog.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name lmx-elog.psi.ch; + + client_max_body_size 64M; + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 4096; + + ssl_certificate /etc/nginx/certs/lmx-elog.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/lmx-elog.psi.ch.key; + + location / { + proxy_pass https://lmx-elog:8080; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } +} diff --git a/docker-compose.yaml b/docker-compose.yaml index d4fc10a..c1be73d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -64,6 +64,30 @@ services: networks: - backend + # benjamin.brem@psi.ch - LAC + # Elog instance + lac-elog: + image: gitea.psi.ch/images/elog:3.1.5 + container_name: lac-elog + restart: always + volumes: + - /opt/logbooks/lac:/usr/local/elog/logbooks + - /opt/webcontent/lac/elog.cfg:/usr/local/elog/elogd.cfg + networks: + - backend + + # valerio.scagnoli@psi.ch - LMX + # Elog instance + lmx-elog: + image: gitea.psi.ch/images/elog:3.1.5 + container_name: lmx-elog + restart: always + volumes: + - /opt/logbooks/lmx:/usr/local/elog/logbooks + - /opt/webcontent/lmx/elog.cfg:/usr/local/elog/elogd.cfg + networks: + - backend + # Rostomyan Tigran # INC0137443 # Elog instance