From 140feb5515a5f7952b82266bab8c4b792378e9ae Mon Sep 17 00:00:00 2001 From: William Wernert Date: Fri, 10 Jan 2020 08:58:50 -0500 Subject: [PATCH] Fix git merge leftovers --- salt/common/nginx/nginx.conf.so-eval | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/salt/common/nginx/nginx.conf.so-eval b/salt/common/nginx/nginx.conf.so-eval index 5c49c0100..d3e377881 100644 --- a/salt/common/nginx/nginx.conf.so-eval +++ b/salt/common/nginx/nginx.conf.so-eval @@ -184,21 +184,6 @@ http { } -<<<<<<< HEAD - location /cyberchef/ { - proxy_pass http://{{ masterip }}:9080/; - proxy_read_timeout 90; - proxy_connect_timeout 90; - proxy_http_version 1.1; # this is essential for chunked responses to work - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Proxy ""; - - } - -======= ->>>>>>> origin/dev location /soctopus/ { proxy_pass http://{{ masterip }}:7000/; proxy_read_timeout 90;