Skip to content

Commit

Permalink
Fixed config
Browse files Browse the repository at this point in the history
  • Loading branch information
oskardudycz committed May 23, 2024
1 parent 8ecd6b4 commit 5ef048f
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 76 deletions.
18 changes: 12 additions & 6 deletions Sample/Helpdesk/Helpdesk.Api/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using Marten.Events.Projections;
using Marten.Pagination;
using Marten.Schema.Identity;
using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR;
using Oakton;
Expand All @@ -27,7 +28,7 @@

var builder = WebApplication.CreateBuilder(args);


builder.WebHost.UseUrls("http://*:5248");
builder.Services
.AddEndpointsApiExplorer()
.AddSwaggerGen()
Expand Down Expand Up @@ -65,6 +66,13 @@
.AddAsyncDaemon(DaemonMode.HotCold);


// Header forwarding to enable Swagger in Nginx
builder.Services.Configure<ForwardedHeadersOptions>(options =>
{
options.ForwardedHeaders =
ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
});

builder.Services
.AddCors(options =>
options.AddPolicy("ClientPermission", policy =>
Expand Down Expand Up @@ -238,11 +246,9 @@ CancellationToken ct
querySession.Json.WriteById<CustomerIncidentsSummary>(customerId, context)
);

if (app.Environment.IsDevelopment())
{
app.UseSwagger()
.UseSwaggerUI();
}
app.UseSwagger()
.UseSwaggerUI()
.UseForwardedHeaders(); // Header forwarding to enable Swagger in Nginx


app.UseCors("ClientPermission");
Expand Down
53 changes: 21 additions & 32 deletions Sample/Helpdesk/Helpdesk.Api/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
version: '3'
version: "3.8"
services:
helpdesk-webapi:
nginx:
restart: always
image: nginx:alpine
ports:
- 8089:80
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf
# - ./nginx.conf:/etc/nginx/conf.d/default.conf
depends_on:
- backend

backend:
build:
dockerfile: Dockerfile
context: .
Expand All @@ -9,43 +20,21 @@ services:
run_codegen: true
deploy:
replicas: 3
networks:
- loadbalancing
depends_on:
- postgres

nginx:
image: nginx
volumes:
- ./nginx.conf:/etc/nginx/conf.d/default.conf
ports:
- "80:80"
networks:
- loadbalancing
depends_on:
- helpdesk-webapi
postgres:
condition: service_healthy
restart: always

postgres:
image: postgres:15.1-alpine
container_name: postgres
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 5s
timeout: 5s
retries: 5
environment:
- POSTGRES_DB=postgres
- POSTGRES_PASSWORD=Password12!
ports:
- "5432:5432"
networks:
- loadbalancing


# nginx:
# build: ../nginx
# container_name: nginx
# ports:
# - "80:80"
# networks:
# - loadbalancing
# depends_on:
# - helpdesk-webapi

networks:
loadbalancing:
60 changes: 22 additions & 38 deletions Sample/Helpdesk/Helpdesk.Api/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,42 +1,26 @@
upstream helpdesk-webapi {
server helpdesk-webapi:5248;
}

server {
# listen 80;
#
# resolver 127.0.0.11 valid=5s;
#
# include /etc/nginx/mime.types;
#
# location / {
# proxy_pass http://helpdesk-webapi/;
# }
#
worker_processes auto;

# listen 80 default_server;
#
# location / {
# proxy_pass http://helpdesk-webapi/;
# proxy_http_version 1.1;
# proxy_set_header Upgrade $http_upgrade;
# proxy_set_header Connection keep-alive;
# proxy_set_header Host $host;
# proxy_cache_bypass $http_upgrade;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header X-Forwarded-Proto $scheme;
# }
events {
worker_connections 1024;
}

listen 80;
server_name localhost;
location / {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $http_host;
proxy_set_header X-NginX-Proxy true;
http {
map $http_connection $connection_upgrade {
"~*Upgrade" $http_connection;
default keep-alive;
}

proxy_redirect off;
proxy_pass http://myserver;
}
server {
listen 80;
location / {
proxy_pass http://backend:5248/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_set_header Host $host;
proxy_cache_bypass $http_upgrade;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
}
}

0 comments on commit 5ef048f

Please sign in to comment.