Merge branch 'hedgedoc' into 'main'

add hedgedoc for sven

See merge request linux-infra/WebHosting!1

conf.d/sf_hedgedoc.conf

@@ -0,0 +1,21 @@
+server {
+    listen 80;
+    server_name sf-hedgedoc.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name sf-hedgedoc.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/sf-hedgedoc.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/sf-hedgedoc.psi.ch.key;
+
+    location / {
+        proxy_pass http://hedgedoc_app:3000;
+        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;
+    }
+}

docker-compose.yaml

@@ -1,4 +1,5 @@
 services:
+  # linux-eng@psi.ch
   nginx:
     image: nginx:latest
     container_name: nginx_proxy
@@ -14,7 +15,8 @@ services:
     networks:
       - public
       - backend
-  
+ 
+  # linux-eng@psi.ch
   excalidraw:
     image: excalidraw/excalidraw:latest
     container_name: excalidraw
@@ -22,6 +24,8 @@ services:
     networks:
       - backend
 
+  # Rostomyan Tigran <tigran.rostomyan@psi.ch>
+  # INC0137443
   pif-elog:
     image: container.psi.ch/images/elog:3.1.5
     container_name: pif-elog
@@ -32,6 +36,8 @@ services:
     networks:
       - backend  
 
+  # Krieger Jonas Andreas <jonas.krieger@psi.ch>, Raselli Andrea-Raeto <andrea.raselli@psi.ch>
+  # Elog as a Service PoC mit musr-elog.psi.ch? linux-eng@psi.ch
   lmu-elog:
     image: container.psi.ch/images/elog:3.1.5
     container_name: lmu-elog
@@ -42,6 +48,8 @@ services:
     networks:
       - backend
 
+  # Huang He <river.huang@psi.ch>
+  # Software host and access to Internet linux-eng@psi.ch
   mcda-calculator:
     image: container.psi.ch/images/mcda-calculator:latest
     container_name: mcda-calculator
@@ -49,7 +57,36 @@ services:
     networks: 
       - backend
 
+  # Augustin Sven <sven.augustin@psi.ch>
+  hedgedoc_app:
+    image: quay.io/hedgedoc/hedgedoc:1.10.1
+    environment:
+      - CMD_DB_URL=postgres://{{ hedgedoc_user }}:{{ hedgedoc_password }}@hedgedoc_db:5432/hedgedoc
+      - CMD_DOMAIN=localhost
+      - CMD_URL_ADDPORT=true
+    volumes:
+      - /opt/webcontent/sf_hedgedoc/uploads:/hedgedoc/public/uploads
+    restart: always
+    depends_on:
+      - database
+    networks:
+      - backend
+      - hedgedoc_backend
+
+  # Augustin Sven <sven.augustin@psi.ch>
+  hedgedoc_db:
+    image: postgres:13.4-alpine
+    environment:
+      - POSTGRES_USER={{ hedgedoc_user }}
+      - POSTGRES_PASSWORD={{ hedgedoc_password }}
+      - POSTGRES_DB=hedgedoc
+    volumes:
+      - /opt/webcontent/sf_hedgedoc/data:/var/lib/postgresql/data
+    restart: always
+    networks:
+      - hedgedoc_backend
+
 networks:
   public:
   backend:
-
+  hedgedoc_backend: