Commit Graph

23 Commits

Author SHA1 Message Date
m0duspwnens
1fca5e65df redo how containers get added to so-status https://github.com/Security-Onion-Solutions/securityonion/issues/1681 2020-11-10 15:31:47 -05: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
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
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
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
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
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
cfd1b82e00 [refactor] Redirect to correct url_base + combine configs 2020-07-08 13:49:33 -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
m0duspwnens
8a64ba727f remote html bind for nginx 2020-04-24 16:18:55 -04:00
m0duspwnens
3136affc91 updating nginx index.html - issue/587 2020-04-24 14:24:33 -04:00
m0duspwnens
766b56a944 update dockers to 1.2.2 2020-04-23 10:11:26 -04:00
m0duspwnens
7e34595f99 rename docker container so-core to so-nginx - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/587 2020-04-21 15:16:08 -04:00
m0duspwnens
fd87e7bc1d breakout common state - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/587 2020-04-21 13:01:56 -04:00