mirror of
https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git
synced 2025-07-16 09:38:49 +02:00
Merge branch 'refs/heads/main' into 7-scalability
# Conflicts: # backend/service/addCalDavRoutes.go
This commit is contained in:
@ -26,6 +26,8 @@ events {
|
||||
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;
|
||||
@ -113,6 +115,7 @@ http {
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
http2 on;
|
||||
server_name cal.htwk-leipzig.de;
|
||||
|
||||
location /api/feed {
|
||||
@ -133,6 +136,7 @@ http {
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
http2 on;
|
||||
server_name htwkalender.de;
|
||||
|
||||
location /api/feed {
|
||||
@ -153,6 +157,7 @@ http {
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
http2 on;
|
||||
server_name htwkalender.de www.htwkalender.de;
|
||||
|
||||
ssl_certificate htwkalender.de.pem;
|
||||
@ -163,6 +168,7 @@ http {
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
http2 on;
|
||||
server_name cal.htwk-leipzig.de;
|
||||
|
||||
ssl_certificate cal.htwk-leipzig.de.pem;
|
||||
|
Reference in New Issue
Block a user