CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-05-05 19:08:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into feature/auth

Browse Source 
# Conflicts:
#	salt/common/nginx/nginx.conf.so-eval
This commit is contained in:
William Wernert
2020-01-09 18:41:46 -05:00
parent 1bfb8bbea2 6ea941dfba
commit 5cb8bd61b6
67 changed files with 2534 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
salt/common/nginx/nginx.conf.so-eval
+3
View File
@@ -184,6 +184,7 @@ http {
}
<<<<<<< HEAD
location /cyberchef/ {
proxy_pass http://{{ masterip }}:9080/;
proxy_read_timeout 90;
@@ -196,6 +197,8 @@ http {
}
=======
>>>>>>> origin/dev
location /soctopus/ {
proxy_pass http://{{ masterip }}:7000/;
proxy_read_timeout 90;