CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-30 12:53:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix git merge leftovers

Browse Source
This commit is contained in:
William Wernert
2020-01-10 08:58:50 -05:00
parent 5cb8bd61b6
commit 140feb5515
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
salt/common/nginx/nginx.conf.so-eval
View File

@@ -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;