fix indentation

bookstack/docker-compose.yaml

@@ -21,7 +21,7 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - "6875:6875"
+      - "6875:80"
     restart: unless-stopped
     depends_on:
       - bookstack_db
@@ -36,12 +36,12 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Europe/London
+      - TZ=America/New_York
       - MYSQL_DATABASE=bookstackapp
       - MYSQL_USER=bookstack
       - MYSQL_PASSWORD=bookstackpass
     volumes:
       - ../data/bookstack/db_config:/config
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "3306:3306"
     restart: unless-stopped

nginx/nginx/templates/git.conf.template

@@ -21,10 +21,10 @@ server {
 		proxy_set_header X-Forwarded-Proto $scheme;
 	}
 
-  # force login with OIDC
-  location /user/login {
-    return 302 https://${GITEA_HOSTNAME}/user/oauth2/keycloak;
-  }
+        # force login with OIDC
+        location /user/login {
+          return 302 https://${GITEA_HOSTNAME}/user/oauth2/keycloak;
+        }
 
 	listen 443 ssl;
 	ssl_certificate /etc/letsencrypt/live/${DOMAIN_NAME}/fullchain.pem;

nginx/nginx/templates/wiki.conf.template

@@ -1,27 +1,34 @@
 server {
 	server_name ${BOOKSTACK_HOSTNAME};
-	client_max_body_size 128m;
-
-	sendfile on;
-	tcp_nopush on;
-	tcp_nodelay on;
-	keepalive_timeout 65;
-	types_hash_max_size 2048;
-
-	gzip on;
-	gzip_disable "msie6";
-
-	proxy_read_timeout 1800s;
+	client_max_body_size 0;
 
 	location / {
-		proxy_pass http://host.docker.internal:6875;
+		# Proxy Header Settings
+		proxy_set_header Connection $connection_upgrade;
+		proxy_set_header Early-Data $ssl_early_data;
 		proxy_set_header Host $host;
-		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header Proxy "";
+		proxy_set_header Upgrade $http_upgrade;
 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-Forwarded-Host $host;
+		proxy_set_header X-Forwarded-Method $request_method;
+		proxy_set_header X-Forwarded-Port $server_port;
 		proxy_set_header X-Forwarded-Proto $scheme;
+		proxy_set_header X-Forwarded-Server $host;
+		proxy_set_header X-Forwarded-Ssl on;
+		proxy_set_header X-Forwarded-Uri $request_uri;
+		proxy_set_header X-Original-Method $request_method;
+		proxy_set_header X-Original-URL $scheme://$http_host$request_uri;
+		proxy_set_header X-Real-IP $remote_addr;
+
+		set $upstream_app host.docker.internal;
+		set $upstream_port 6875;
+		set $upstream_proto http;
+		proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 	}
 
-	listen 443 ssl;
+	listen 443 ssl http2;
+        listen [::]:443 ssl http2;
 	ssl_certificate /etc/letsencrypt/live/${DOMAIN_NAME}/fullchain.pem;
 	ssl_certificate_key /etc/letsencrypt/live/${DOMAIN_NAME}/privkey.pem;
 	include /etc/nginx/includes/options-ssl-nginx.conf;