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;
# Cloudflare IP Ranges (https://www.cloudflare.com/ips/)
set_real_ip_from 173.245.48.0/20;
set_real_ip_from 103.21.244.0/22;
@ -113,6 +116,7 @@ http {
server {
listen 80;
listen [::]:80;
http2 on;
server_name dev.htwkalender.de;
return 301 https://$host$request_uri;
}
@ -120,6 +124,7 @@ http {
server {
listen 443 ssl;
listen [::]:443 ssl;
http2 on;
server_name dev.htwkalender.de;
ssl_certificate dev_htwkalender_de.pem;
ssl_certificate_key dev_htwkalender_de.key.pem;