2658 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
m0duspwnens	81ce7b915a	Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev	2020-05-04 11:05:31 -04:00
Josh Patterson	285d74767d	Merge pull request #624 from Security-Onion-Solutions/issue/619 ... Issue/619	2020-05-01 15:44:12 -04:00
m0duspwnens	2dd2289c94	fix some happy mistakes - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/619	2020-05-01 15:37:54 -04:00
m0duspwnens	174b353ce0	salt version pulled due to vuln, update to 2019.2.4	2020-05-01 14:01:10 -04:00
m0duspwnens	e2244bd839	use maps for so-status - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/619	2020-05-01 13:21:11 -04:00
m0duspwnens	19eec6e1f4	Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev	2020-04-29 16:10:52 -04:00
Josh Patterson	cb541ebea2	Merge pull request #614 from Security-Onion-Solutions/issue/613 ... only do sed if fleet_node is true	2020-04-29 16:02:22 -04:00
m0duspwnens	9833d1754a	only do sed if fleet_node is true - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/613	2020-04-29 11:19:28 -04:00
m0duspwnens	e95842deef	Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev	2020-04-29 09:49:07 -04:00
Josh Patterson	f8dde1201e	Merge pull request #609 from Security-Onion-Solutions/issue/585 ... Issue/585	2020-04-28 16:11:38 -04:00
m0duspwnens	fdf5450a2e	remove stuff.sls	2020-04-28 14:29:44 -04:00
m0duspwnens	8d2ca003fb	change how we populate local.zeek - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/585	2020-04-28 14:10:57 -04:00
m0duspwnens	c46a45f00f	LOAD to LOCAL in local.zeek and sort local.zeek and zeekctl.cfg output	2020-04-28 12:08:32 -04:00
m0duspwnens	ca42850a0c	add missing )	2020-04-28 11:31:19 -04:00
m0duspwnens	b6741daca6	pillarize local.zeek and move zeekctl from defaults.yml to zeek pillar - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/585	2020-04-28 09:44:37 -04:00
m0duspwnens	3b5736f983	Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev	2020-04-27 16:48:14 -04:00
Josh Patterson	90aabde4c9	Merge pull request #607 from Security-Onion-Solutions/issue/587 ... remove nginx from unneeded states	2020-04-27 15:10:12 -04:00
m0duspwnens	aff02e1f1c	remove nginx from unneeded states	2020-04-27 15:02:30 -04:00
Jason Ertel	e4afc20366	Update Kratos config to match latest version of Kratos	2020-04-24 16:27:36 -04:00
Josh Patterson	19a3354aa2	Merge pull request #602 from Security-Onion-Solutions/issue/587 ... Issue/587	2020-04-24 16:26:46 -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
m0duspwnens	00e12d0747	Merge remote-tracking branch 'remotes/origin/dev' into issue/587	2020-04-23 15:46:50 -04:00
Mike Reeves	ad17c18824	Update Version to 1.2.2 for build automation	2020-04-23 13:59:18 -04:00
Mike Reeves	4197bfb348	Change tarball location	2020-04-23 10:29:09 -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
m0duspwnens	95ddb80612	Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev	2020-04-21 08:40:16 -04:00
Mike Reeves	eaf54781e8	Merge branch 'master' into dev	2020-04-20 16:03:23 -04:00
Mike Reeves	c024bdf427	remove proxy declaration	2020-04-20 15:31:13 -04:00
Mike Reeves	f271fadfec	Fix tarball	2020-04-20 15:28:13 -04:00
Mike Reeves	af1a44f479	Merge pull request #580 from Security-Onion-Solutions/dougburks-patch-1 ... Update README.md to point ISO users to the ISO page	2020-04-19 18:43:48 -04:00
Doug Burks	ea7dd0763f	Update README.md	2020-04-18 06:50:17 -04:00
Doug Burks	eebc75d245	Update README.md	2020-04-18 06:48:12 -04:00
Doug Burks	997cb8f9ae	Update README.md	2020-04-18 06:26:12 -04:00
Mike Reeves	b65b66fe57	Merge pull request #578 from Security-Onion-Solutions/dev ... 1.2.1 1.2.1	2020-04-17 13:40:32 -04:00
Mike Reeves	0e654f5394	Update README.md	2020-04-17 13:38:13 -04:00
Mike Reeves	ed2152ce74	Merge branch 'master' into dev	2020-04-17 13:36:48 -04:00
Mike Reeves	39d70d2e99	Update README.md	2020-04-17 13:30:35 -04:00
Josh Patterson	6cc7b98e7e	Merge pull request #577 from Security-Onion-Solutions/quickfix/evallspillar ... remove logstash pillars from eval in top	2020-04-16 16:13:35 -04:00
m0duspwnens	93c0730a2f	remove logstash pillars from eval in top	2020-04-16 16:12:24 -04:00
m0duspwnens	703319f66b	Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev	2020-04-16 16:11:02 -04:00
Mike Reeves	919c57ce00	Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev	2020-04-16 16:00:15 -04:00
Mike Reeves	f1f681794c	Update Notes	2020-04-16 16:00:08 -04:00
m0duspwnens	5b0158a6c9	Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev	2020-04-16 15:54:29 -04:00
Josh Patterson	08f3d29b91	Merge pull request #568 from Security-Onion-Solutions/issue566 ... fix failed setup FP	2020-04-16 15:54:14 -04:00
m0duspwnens	615eecbd5a	Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion-saltstack into dev	2020-04-16 15:47:10 -04:00