mirror of
https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender-pwa.git
synced 2025-08-09 05:07:46 +02:00
Merge remote-tracking branch 'htwk-org/development'
# Conflicts: # backend/go.mod # frontend/index.html # frontend/package-lock.json # frontend/package.json # frontend/public/themes/lara-dark-blue/theme.css # frontend/public/themes/lara-dark-blue/theme.css.map # frontend/public/themes/lara-light-blue/theme.css # frontend/public/themes/lara-light-blue/theme.css.map # frontend/src/App.vue # frontend/src/components/DarkModeSwitcher.vue # frontend/src/i18n/index.ts # frontend/src/main.ts # frontend/src/router/index.ts # frontend/src/view/CalendarLink.vue # frontend/src/view/edit/EditCalendar.vue # frontend/vite.config.ts # reverseproxy.conf # reverseproxy.local.conf # services/data-manager/main.go # services/data-manager/model/roomOccupancyModel.go # services/data-manager/service/addRoute.go # services/data-manager/service/addSchedule.go # services/data-manager/service/db/dbGroups.go # services/data-manager/service/feed/feedFunctions.go # services/data-manager/service/fetch/sport/sportFetcher.go # services/data-manager/service/fetch/v1/fetchSeminarEventService.go # services/data-manager/service/fetch/v1/fetchSeminarGroupService.go # services/data-manager/service/fetch/v2/fetcher.go # services/data-manager/service/functions/filter.go # services/data-manager/service/functions/filter_test.go # services/data-manager/service/functions/time/parse.go # services/data-manager/service/room/roomService.go # services/data-manager/service/room/roomService_test.go # services/go.sum # services/ical/service/connector/grpc/client.go
This commit is contained in:
@@ -1,22 +1,6 @@
|
||||
#Calendar implementation for the HTWK Leipzig timetable. Evaluation and display of the individual dates in iCal format.
|
||||
#Copyright (C) 2024 HTWKalender support@htwkalender.de
|
||||
|
||||
#This program is free software: you can redistribute it and/or modify
|
||||
#it under the terms of the GNU Affero General Public License as published by
|
||||
#the Free Software Foundation, either version 3 of the License, or
|
||||
#(at your option) any later version.
|
||||
|
||||
#This program is distributed in the hope that it will be useful,
|
||||
#but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
#GNU Affero General Public License for more details.
|
||||
|
||||
#You should have received a copy of the GNU Affero General Public License
|
||||
#along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
worker_processes 4;
|
||||
|
||||
error_log /opt/bitnami/nginx/logs/error.log;
|
||||
error_log /opt/bitnami/nginx/logs/error.log debug;
|
||||
pid /opt/bitnami/nginx/tmp/nginx.pid;
|
||||
|
||||
events {
|
||||
@@ -27,43 +11,31 @@ http {
|
||||
include mime.types;
|
||||
default_type application/octet-stream;
|
||||
|
||||
access_log /opt/bitnami/nginx/logs/proxy_access.log;
|
||||
error_log /opt/bitnami/nginx/logs/proxy_error.log;
|
||||
|
||||
sendfile on;
|
||||
keepalive_timeout 180s;
|
||||
send_timeout 180s;
|
||||
|
||||
client_body_temp_path /opt/bitnami/nginx/tmp/client_temp;
|
||||
proxy_temp_path /opt/bitnami/nginx/tmp/proxy_temp_path;
|
||||
fastcgi_temp_path /opt/bitnami/nginx/tmp/fastcgi_temp;
|
||||
uwsgi_temp_path /opt/bitnami/nginx/tmp/uwsgi_temp;
|
||||
scgi_temp_path /opt/bitnami/nginx/tmp/scgi_temp;
|
||||
|
||||
proxy_buffering on;
|
||||
proxy_buffers 8 16k;
|
||||
proxy_buffer_size 16k;
|
||||
proxy_busy_buffers_size 64k;
|
||||
proxy_temp_file_write_size 64k;
|
||||
proxy_max_temp_file_size 1024m;
|
||||
map $request_method $ratelimit_key {
|
||||
POST $binary_remote_addr;
|
||||
default "";
|
||||
}
|
||||
|
||||
limit_req_zone $ratelimit_key zone=createFeed:10m rate=1r/m;
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name dev.htwkalender.de;
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
http2 on;
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
|
||||
ssl_certificate /opt/bitnami/nginx/conf/dev_htwkalender_de.pem;
|
||||
ssl_certificate_key /opt/bitnami/nginx/conf/dev_htwkalender_de.key.pem;
|
||||
location /api/feed {
|
||||
limit_req zone=createFeed nodelay;
|
||||
proxy_pass http://htwkalender-ical:8091;
|
||||
client_max_body_size 20m;
|
||||
proxy_connect_timeout 600s;
|
||||
proxy_read_timeout 600s;
|
||||
proxy_send_timeout 600s;
|
||||
send_timeout 600s;
|
||||
limit_req_status 429;
|
||||
}
|
||||
|
||||
location /api {
|
||||
proxy_pass http://htwkalender-backend:8090;
|
||||
proxy_pass http://htwkalender-data-manager:8090;
|
||||
client_max_body_size 20m;
|
||||
proxy_connect_timeout 600s;
|
||||
proxy_read_timeout 600s;
|
||||
@@ -72,13 +44,16 @@ http {
|
||||
}
|
||||
|
||||
location /_ {
|
||||
proxy_pass http://htwkalender-backend:8090;
|
||||
# Increase upload file size
|
||||
proxy_pass http://htwkalender-data-manager:8090;
|
||||
client_max_body_size 100m;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass https://htwkalender-frontend:8000;
|
||||
}
|
||||
|
||||
location /__devtools__ {
|
||||
proxy_pass https://htwkalender-frontend:8000;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user