Merge branch 'refs/heads/main' into 7-scalability

# Conflicts:
#	backend/service/addCalDavRoutes.go
This commit is contained in:
Elmar Kresse
2024-06-10 21:01:12 +02:00
23 changed files with 566 additions and 20957 deletions

View File

@ -27,6 +27,9 @@ http {
include mime.types;
default_type application/octet-stream;
gzip on;
gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
access_log /opt/bitnami/nginx/logs/proxy_access.log;
error_log /opt/bitnami/nginx/logs/proxy_error.log;
@ -51,6 +54,7 @@ http {
server {
listen 80;
listen [::]:80;
http2 on;
location /api/feed {
proxy_pass http://htwkalender-ical:8091;