mirror of https://github.com/MISP/misp-docker
Merge pull request #95 from helinko/fix-nginx-conf
Fix nginx config
commit
33791f72b4
|
@ -1,2 +1,4 @@
|
|||
.env
|
||||
data
|
||||
proxy/ssl/misp.crt
|
||||
proxy/ssl/misp.key
|
||||
|
|
|
@ -4,12 +4,12 @@ services:
|
|||
proxy:
|
||||
build:
|
||||
context: proxy
|
||||
container_name: proxy
|
||||
container_name: misp_proxy
|
||||
restart: unless-stopped
|
||||
image: misp-proxy:latest
|
||||
ports:
|
||||
- 80:80
|
||||
- 4443:443
|
||||
- 443:443
|
||||
|
||||
web:
|
||||
build: web
|
||||
|
|
|
@ -1,11 +1,8 @@
|
|||
FROM nginx:1.9
|
||||
FROM nginx:1.18
|
||||
|
||||
# default conf for proxy service
|
||||
COPY ./default.conf /etc/nginx/conf.d/default.conf
|
||||
|
||||
# NOT FOUND response
|
||||
COPY ./backend-not-found.html /var/www/html/backend-not-found.html
|
||||
|
||||
# Proxy and SSL configurations
|
||||
COPY ./includes/ /etc/nginx/includes/
|
||||
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
<html>
|
||||
<head><title>Proxy Backend Not Found</title></head>
|
||||
<body >
|
||||
<h2>Proxy Backend Not Found</h2>
|
||||
</body>
|
||||
</html>
|
|
@ -1,12 +1,15 @@
|
|||
# web service1 config.
|
||||
# plain http redirect to https
|
||||
server {
|
||||
listen 80;
|
||||
listen 443 ssl http2;
|
||||
server_name web;
|
||||
|
||||
if ($scheme != "https") {
|
||||
rewrite ^ https://$host$uri permanent;
|
||||
}
|
||||
listen [::]:80;
|
||||
server_name localhost;
|
||||
return 301 https://$server_name$request_uri;
|
||||
}
|
||||
# main server, reverse proxy to 'web' container
|
||||
server {
|
||||
listen 443 ssl http2 default_server;
|
||||
listen [::]:443 ssl http2 default_server;
|
||||
server_name localhost;
|
||||
|
||||
# Path for SSL config/key/certificate
|
||||
ssl_certificate /etc/ssl/certs/nginx/misp.crt;
|
||||
|
@ -21,25 +24,3 @@ server {
|
|||
access_log off;
|
||||
error_log /var/log/nginx/error.log error;
|
||||
}
|
||||
|
||||
# Default
|
||||
server {
|
||||
listen 80 default_server;
|
||||
|
||||
server_name _;
|
||||
root /var/www/html;
|
||||
|
||||
charset UTF-8;
|
||||
|
||||
error_page 404 /backend-not-found.html;
|
||||
location = /backend-not-found.html {
|
||||
allow all;
|
||||
}
|
||||
location / {
|
||||
return 404;
|
||||
}
|
||||
|
||||
access_log off;
|
||||
log_not_found off;
|
||||
error_log /var/log/nginx/error.log error;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue