Skip to content

Commit

Permalink
resolve conflicts (#8619)
Browse files Browse the repository at this point in the history
  • Loading branch information
sainak authored Sep 25, 2024
1 parent 67c5240 commit 60068ad
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
server {
listen 80;
root /usr/share/nginx/html;

location = /index.html {
expires 6h;
include mime.types;
types {
text/javascript js mjs;
}

listen 80;

location / {
expires 7d;
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri $uri/ /index.html;
}

error_page 500 502 503 504 /50x.html;

location = /50x.html {
root /usr/share/nginx/html;
}
}

0 comments on commit 60068ad

Please sign in to comment.