Commit Graph

103 Commits

Author SHA1 Message Date
William Wernert
d63358c8f0 [fix] Correct pillar reference + nginx errors 2020-10-20 14:30:06 -04:00
William Wernert
42e285cfbe Merge branch 'dev' into feature/nginx-update
# Conflicts:
#	salt/nginx/etc/nginx.conf
#	salt/nginx/etc/nginx.conf.so-eval
#	salt/nginx/etc/nginx.conf.so-manager
#	salt/nginx/etc/nginx.conf.so-standalone
2020-10-19 13:25:46 -04:00
Mike Reeves
af9a19b6e8 Merge pull request #1321 from Security-Onion-Solutions/experimental
IDS Tools now with Airgap support
2020-09-10 19:05:16 -04:00
Mike Reeves
53319738c4 Fix Nginx state 2020-09-10 16:56:48 -04:00
Mike Reeves
ef46094b0c Update all nginx configs 2020-09-10 13:55:56 -04:00
Mike Reeves
5d4e8925a3 Add Firewall Logic 2020-09-09 21:16:40 -04:00
m0duspwnens
09cc8ae1fb fail the state if it isnt in top 2020-09-09 16:48:50 -04:00
m0duspwnens
01c9f7b2ae merge with dev and resolve conflicts 2020-09-09 16:23:36 -04:00
Mike Reeves
426257443a Final airgap tweaks 2020-09-09 10:54:47 -04:00
Mike Reeves
b2ee757db2 Airgap Time 2020-09-03 10:35:12 -04:00
Mike Reeves
9745191f19 Add Airgap State 2020-09-02 16:17:44 -04:00
m0duspwnens
a229ae82ce only allow state to run if it is in top for the node 2020-09-02 16:15:52 -04:00
Jason Ertel
ff5d1cd815 Expand nginx body size limit to 2.5GB to handle 2G PCAPs from sensors 2020-09-01 10:07:28 -04:00
m0duspwnens
e6da423dc3 change reference from manager:url_base to global:url_base - https://github.com/Security-Onion-Solutions/securityonion/issues/1039 2020-08-14 17:55:30 -04:00
Jason Ertel
40b5b96e17 Respond with 403 status code to unauthorized sensor requests 2020-08-13 15:00:49 -04:00
m0duspwnens
b5c9d44d91 nginx config for import node 2020-08-12 11:15:14 -04:00
m0duspwnens
11433b87e6 Merge remote-tracking branch 'remotes/origin/dev' into issue/1049 2020-08-10 16:36:49 -04:00
Josh Brower
928e5ed832 Playbook/Nav Fixes - Issue #1064 2020-08-07 17:02:48 -04:00
m0duspwnens
7933bafd55 more fixes for importpcap node 2020-08-07 15:46:45 -04:00
Mike Reeves
24ed92c9dc minio and change to global 2020-08-04 15:54:03 -04:00
William Wernert
6f73d62400 Merge branch 'dev' into feature/nginx-update 2020-07-20 13:13:32 -04:00
Jason Ertel
8f66a27f07 Refactor image repository to a single variable 2020-07-13 18:26:43 -04:00
Josh Brower
e62381e998 Merge pull request #982 from Security-Onion-Solutions/bugfix/alerting
Misc fixes
2020-07-10 19:50:27 -04:00
Josh Brower
65062d93f4 Misc fixes 2020-07-10 19:43:43 -04:00
William Wernert
a5c790c31e [fix] managerr -> manager 2020-07-10 17:50:53 -04:00
William Wernert
8b146aac32 Merge branch 'dev' into feature/nginx-update
# Conflicts:
#	salt/nginx/etc/nginx.conf
#	salt/nginx/etc/nginx.conf.so-eval
#	salt/nginx/etc/nginx.conf.so-manager
#	salt/nginx/etc/nginx.conf.so-managersearch
#	salt/nginx/etc/nginx.conf.so-mastersearch
#	salt/nginx/etc/nginx.conf.so-standalone
2020-07-10 17:49:34 -04:00
William Wernert
81006ebbd0 [fix] Reflect new manager syntax 2020-07-10 17:46:15 -04:00
m0duspwnens
5ca3ecf4bd fix reference to master grain 2020-07-09 15:42:39 -04:00
m0duspwnens
3cf31e2460 https://github.com/Security-Onion-Solutions/securityonion/issues/404 2020-07-09 11:27:06 -04:00
William Wernert
49e5cb311e [fix][WIP] set ssl cert for redirect 443 server block 2020-07-08 16:05:48 -04:00
William Wernert
533ed395e7 [fix][WIP] Remove ssl and http2 from redirect server block 2020-07-08 15:59:31 -04:00
William Wernert
a0ffe26334 [fix] Only one default_server is allowed per port 2020-07-08 15:56:36 -04:00
William Wernert
0c3e35c55e [fix] correct jinja template syntax 2020-07-08 14:30:27 -04:00
William Wernert
cfd1b82e00 [refactor] Redirect to correct url_base + combine configs 2020-07-08 13:49:33 -04:00
Mike Reeves
3b452ab597 Change grafana to use anon auth 2020-07-06 16:39:43 -04:00
William Wernert
8d624e6ade [fix] Move navigatordefaultlayer file.managed state to nginx sls 2020-06-30 10:53:10 -04:00
William Wernert
bd36749959 [feat] Remove navigator container references 2020-06-24 12:38:32 -04:00
William Wernert
0a0fe5914a [fix][feat] Move navigator entries to static files + fix indent 2020-06-23 17:57:14 -04:00
William Wernert
941ad5acf6 Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev 2020-06-08 12:12:29 -04:00
William Wernert
e2c3fe3342 [fix] Add X-Forwarded-Proto to nginx configs 2020-06-08 12:12:25 -04:00
Josh Brower
3f3990ac83 Merge remote-tracking branch 'remotes/origin/dev' into feature/fleet-setup 2020-06-08 08:30:37 -04:00
Jason Ertel
7edf9a67c3 Ensure standalone mode supports the settings flow 2020-06-04 10:46:27 -04:00
Jason Ertel
e6fcf75181 Re-ordered wazuh setup to avoid agent-service failures due to missing client.keys file; Prepare for user profile settings screen support in reverse proxy 2020-06-02 17:31:51 -04:00
Josh Brower
4b14ecf1d9 Fleet standalone fixes 2020-06-01 16:36:32 -04:00
m0duspwnens
c89bc0b51a create nginx conf for standalone - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/140 2020-05-15 14:42:38 -04:00
m0duspwnens
9adf08522c nginx portion of https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/623 2020-05-04 15:43:09 -04:00
m0duspwnens
8a64ba727f remote html bind for nginx 2020-04-24 16:18:55 -04:00
Mike Reeves
d695514929 Fix Error locations 2020-04-24 14:28:23 -04:00
m0duspwnens
3136affc91 updating nginx index.html - issue/587 2020-04-24 14:24:33 -04:00
Mike Reeves
09abd723d1 Add favicons back 2020-04-24 13:42:08 -04:00