Skip to content

Commit 274e581

Browse files
authored
Merge pull request #102 from flatrun/fix/nginx-default-server
fix(nginx): Add default server block for welcome page
2 parents 8637855 + 5a69f78 commit 274e581

4 files changed

Lines changed: 17 additions & 2 deletions

File tree

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.53
1+
0.1.54

templates/infra/nginx/default.conf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
server {
2+
listen 80 default_server;
3+
listen [::]:80 default_server;
4+
server_name _;
5+
6+
root /usr/share/nginx/html;
7+
index index.html;
8+
9+
location / {
10+
try_files $uri $uri/ =404;
11+
}
12+
}

templates/infra/nginx/metadata.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ setup:
2929
dest: html/index.html
3030
overwrite: false
3131
external: true
32+
- src: default.conf
33+
dest: conf.d/default.conf
34+
overwrite: false
3235
- dest: conf.d/rate_limits.conf
3336
overwrite: false
3437
empty: true

templates/templates.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
//go:embed */metadata.yml */docker-compose.yml
1212
//go:embed infra/*/metadata.yml infra/*/docker-compose.yml
13-
//go:embed infra/nginx/nginx.conf infra/nginx/nginx.lua.conf infra/nginx/lua/*
13+
//go:embed infra/nginx/nginx.conf infra/nginx/nginx.lua.conf infra/nginx/default.conf infra/nginx/lua/*
1414
//go:embed welcome/index.html
1515
var FS embed.FS
1616

0 commit comments

Comments
 (0)