Jorge Reyes
|
b59a95b72f
|
Merge pull request #11594 from Security-Onion-Solutions/fix/playbookrule
FIX: Add -watch to soctopus saltstate for file SOCtopus.conf. Makes contai…
|
2023-10-23 11:51:53 -04:00 |
|
reyesj2
|
030a667d26
|
Add -watch to soctopus saltstate for file SOCtopus.conf. Makes container restart @ highstate if file is updated.
Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>
|
2023-10-23 11:47:14 -04:00 |
|
Josh Patterson
|
a40760e601
|
Merge pull request #11592 from Security-Onion-Solutions/minechanges
Minechanges
|
2023-10-23 10:37:05 -04:00 |
|
m0duspwnens
|
dc3ca99c12
|
ask the minion if it can see itself in the mine
|
2023-10-20 17:16:33 -04:00 |
|
m0duspwnens
|
7e3aa11a73
|
check mine is populated with ip before telling node to highstate
|
2023-10-20 16:27:20 -04:00 |
|
m0duspwnens
|
c409339446
|
change post setup highstate cron to 5 minutes since accepting minion runs a highstate
|
2023-10-20 13:46:24 -04:00 |
|
m0duspwnens
|
c588bf4395
|
update mine and highstate minion when added
|
2023-10-20 13:43:12 -04:00 |
|
m0duspwnens
|
6d77b1e4c3
|
continue loop if minion not in mine
|
2023-10-20 13:41:53 -04:00 |
|
m0duspwnens
|
99662c999f
|
log operation and minion target
|
2023-10-20 13:41:24 -04:00 |
|
m0duspwnens
|
ef2b89f5bf
|
fix attempts logic
|
2023-10-20 13:40:40 -04:00 |
|
Josh Patterson
|
2878f82754
|
Merge pull request #11582 from Security-Onion-Solutions/minechanges
handle a minion not being in the mine data return
|
2023-10-20 10:07:44 -04:00 |
|
m0duspwnens
|
2e16250c93
|
handle a minion not being in the mine data return
|
2023-10-20 10:00:39 -04:00 |
|
m0duspwnens
|
f03bbdbc09
|
Merge remote-tracking branch 'origin/2.4/dev' into upgrade/salt3006.3
|
2023-10-19 17:01:12 -04:00 |
|
m0duspwnens
|
dbfccdfff8
|
fix logging when using wait_for_minion
|
2023-10-19 16:53:03 -04:00 |
|
m0duspwnens
|
dfcbbfd157
|
update call to wait_for_salt_minion with new options in so-functions
|
2023-10-19 15:58:50 -04:00 |
|
m0duspwnens
|
37e803917e
|
have soup wait_for_salt_minion() before running any highstate
|
2023-10-19 15:58:10 -04:00 |
|
m0duspwnens
|
66ee074795
|
add wait_for_salt_minion to so-common
|
2023-10-19 15:57:24 -04:00 |
|
m0duspwnens
|
90bde94371
|
handle debian family salt upgrade for soup
|
2023-10-19 13:46:48 -04:00 |
|
m0duspwnens
|
84f8e1cc92
|
debian family upgrade salt without -r flag
|
2023-10-19 13:46:07 -04:00 |
|
m0duspwnens
|
e3830fa286
|
all more os to set_os in so-common
|
2023-10-19 13:43:03 -04:00 |
|
m0duspwnens
|
13a5c8baa7
|
remove extra ||
|
2023-10-19 11:19:51 -04:00 |
|
m0duspwnens
|
c5610edd83
|
handle salt for r9 and c9
|
2023-10-19 11:12:20 -04:00 |
|
weslambert
|
5119e6c45a
|
Merge pull request #11570 from Security-Onion-Solutions/feature/additional_integrations
Additional integrations
|
2023-10-19 09:30:40 -04:00 |
|
m0duspwnens
|
02e22c87e8
|
Merge remote-tracking branch 'origin/2.4/dev' into upgrade/salt3006.3
|
2023-10-19 09:15:31 -04:00 |
|
Mike Reeves
|
0772926992
|
Merge pull request #11573 from Security-Onion-Solutions/minechanges
|
2023-10-18 19:45:23 -04:00 |
|
m0duspwnens
|
b2bb92d413
|
remove extra space
|
2023-10-18 19:38:19 -04:00 |
|
Mike Reeves
|
19bebe44aa
|
Merge pull request #11572 from Security-Onion-Solutions/minechanges
|
2023-10-18 19:37:34 -04:00 |
|
m0duspwnens
|
f30a652e19
|
add back redirects
|
2023-10-18 19:31:45 -04:00 |
|
m0duspwnens
|
ff18b1f074
|
remove redirect
|
2023-10-18 18:45:14 -04:00 |
|
m0duspwnens
|
9eb682bc40
|
generate_ca after salt-master and salt-minion states run
|
2023-10-18 18:37:35 -04:00 |
|
Wes
|
c135f886a9
|
Remove Carbon Black Cloud integration
|
2023-10-18 20:41:34 +00:00 |
|
Wes
|
28b7a24cc1
|
Add templates for integrations
|
2023-10-18 20:36:04 +00:00 |
|
m0duspwnens
|
a52ee063e5
|
use generate_ca and generate_ssl functions and move them up
|
2023-10-18 16:35:33 -04:00 |
|
Wes
|
767a54c91b
|
Add pkgs
|
2023-10-18 20:07:26 +00:00 |
|
m0duspwnens
|
ac28e1b967
|
verify crt and key differently in checkmine
|
2023-10-18 15:53:12 -04:00 |
|
Jorge Reyes
|
5e10a0d9e2
|
Merge pull request #11568 from Security-Onion-Solutions/2.4/zeek6
Add back plugin-tds/ plugin-profinet. Using patched versions for Zeek 6
|
2023-10-18 15:39:30 -04:00 |
|
reyesj2
|
dd28dc6ddd
|
Add back plugin-tds/ plugin-profinet. Using patched versions for Zeek 6
Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>
|
2023-10-18 15:30:32 -04:00 |
|
m0duspwnens
|
e58c1e189c
|
use x509 instead of file for onchanges
|
2023-10-18 15:10:17 -04:00 |
|
m0duspwnens
|
1c1b23c328
|
fix mine update for ca
|
2023-10-18 15:07:18 -04:00 |
|
m0duspwnens
|
2206cdb0fa
|
change soup comment
|
2023-10-18 15:04:39 -04:00 |
|
m0duspwnens
|
1999db0bb3
|
apply ca state early in setup
|
2023-10-18 15:02:22 -04:00 |
|
m0duspwnens
|
c3cde61202
|
docker service watches and requires the intca
|
2023-10-18 15:01:26 -04:00 |
|
m0duspwnens
|
8e68f96316
|
check that the manager has a ca in the mine and that it is valid
|
2023-10-18 13:59:15 -04:00 |
|
m0duspwnens
|
138aa9c554
|
update the mine with the ca when it is created or changed
|
2023-10-18 13:54:14 -04:00 |
|
weslambert
|
f0e380870d
|
Merge pull request #11567 from Security-Onion-Solutions/fix/mhr_docs
Add note regarding DNS resolver
|
2023-10-18 13:46:25 -04:00 |
|
weslambert
|
34717fb65e
|
Add note regarding DNS resolver
|
2023-10-18 13:44:09 -04:00 |
|
Josh Patterson
|
d81dfb99d0
|
Merge pull request #11563 from Security-Onion-Solutions/minechanges
Minechanges
|
2023-10-17 17:36:46 -04:00 |
|
m0duspwnens
|
fb9a0ab8b6
|
endif not fi in jinja
|
2023-10-17 17:33:53 -04:00 |
|
m0duspwnens
|
928fb23e96
|
only add node to pillar if returned ip from mine
|
2023-10-17 17:28:28 -04:00 |
|
m0duspwnens
|
d9862aefcf
|
handle mine.p not being present. only check if mine_ip exists, dont compare to alived ip
|
2023-10-17 17:09:52 -04:00 |
|