Commit Graph

444 Commits

Author SHA1 Message Date
Josh Patterson
9a45a9799b Merge pull request #6974 from Security-Onion-Solutions/issue/6599
https://github.com/Security-Onion-Solutions/securityonion/issues/6599
2022-01-25 09:11:33 -05:00
m0duspwnens
edd8709cdd remove export LC_CTYPE="en_US.UTF-8" from soup 2022-01-24 19:42:56 -05:00
m0duspwnens
d6fc436d49 copy files to default salt base 2022-01-24 19:30:34 -05:00
m0duspwnens
82e2b2b611 dont escape raw and endraw 2022-01-24 17:03:25 -05:00
m0duspwnens
d083338350 adding --local 2022-01-24 16:46:29 -05:00
m0duspwnens
e3f1b456e6 add raw end raw back 2022-01-24 16:09:15 -05:00
m0duspwnens
268e07e2a2 remove jinja from soup scripts 2022-01-24 15:49:55 -05:00
Jason Ertel
4ab7a6a079 Merge pull request #6967 from Security-Onion-Solutions/kilo
Copyright year and format update
2022-01-24 10:39:31 -05:00
Jason Ertel
eefcc929c2 Update copyright pattern to match other repos 2022-01-24 10:09:23 -05:00
Jason Ertel
7c22f46a55 Update copyright year for 2022 2022-01-24 09:35:29 -05:00
m0duspwnens
baa93301b5 enable cron at the end of soup 2022-01-20 16:53:33 -05:00
m0duspwnens
01cb505338 start cron and enable highstate if soup exits on error 2022-01-20 16:31:01 -05:00
m0duspwnens
e1757926cf start cron and reenable highstate on soup exit 2022-01-20 15:26:03 -05:00
m0duspwnens
a2ed9a86ff remove influixdb salt state files and update patch files for influxdb salt modules/state 2022-01-18 11:33:36 -05:00
m0duspwnens
f5fe466410 repo update 2022-01-14 12:02:35 -05:00
m0duspwnens
82db3fa3c0 restart wazuh with docker restart vs so-wazuh-restart 2022-01-13 13:02:01 -05:00
m0duspwnens
443dc6ebaa move branch echo to main so it is in the log 2022-01-12 16:14:49 -05:00
m0duspwnens
03b9b74ace stop cron before soup upgrades the manager, start cron at the end. add cron state that is in included in common 2022-01-12 16:04:10 -05:00
m0duspwnens
0cf877f169 kill any possible queued salt jobs before stopping salt-master 2022-01-12 12:27:19 -05:00
m0duspwnens
0388912ba7 kill all salt jobs across grid before stopping salt-master. kill all salt jobs on manager before stopping salt-minion. 2022-01-12 11:05:47 -05:00
m0duspwnens
ae0f392035 wait for salt-master and salt-minin to exit. disable highstate before stopping salt-minion. apply salt-minion state before first highstate to update configs 2022-01-11 16:57:29 -05:00
m0duspwnens
5ade8193f0 move highstate messages for more accurate final highstate message 2022-01-11 13:41:51 -05:00
m0duspwnens
0ef130bd38 bootstrap.sh, dont start salt services after salt upgrade, allow soup to do it 2022-01-11 13:12:07 -05:00
m0duspwnens
e33a9eb45c bootstrap.sh, dont start salt services after salt upgrade, allow soup to do it 2022-01-11 13:11:25 -05:00
m0duspwnens
9d19cba600 log time when salt services stopped and started 2022-01-11 13:09:05 -05:00
m0duspwnens
baf297ab0a merge with dev, resolve conflict 2022-01-11 11:24:10 -05:00
Doug Burks
29d8dbe371 Remove unnecessary word 2022-01-11 11:05:30 -05:00
m0duspwnens
91ef9b9366 update salt mine before salt-master and salt-minion get stopped 2022-01-11 10:57:48 -05:00
m0duspwnens
86c8fc6c1c need to update mine after salt-master starts 2022-01-11 08:56:38 -05:00
Josh Patterson
3c44f6fd41 Merge pull request #6793 from Security-Onion-Solutions/23100soup_jpp
23100soup
2022-01-07 13:32:33 -05:00
m0duspwnens
871fd115ae put so-firewalll in /usr/sbin since salt-master isnt running at this time 2022-01-07 12:04:19 -05:00
m0duspwnens
fd0e5d7d29 make sure so-firewall is up to date 2022-01-07 11:10:48 -05:00
m0duspwnens
5ecb63f5cf prevent exit if minion doesnt respond 2022-01-06 16:17:51 -05:00
m0duspwnens
cd590b894a check that ossec.conf exists 2022-01-06 12:39:48 -05:00
weslambert
db43e21378 Fix indentation 2022-01-05 10:46:41 -05:00
weslambert
4d8b417fc9 Denote which branch is being used in SOUP if BRANCH is specified 2022-01-05 10:41:27 -05:00
m0duspwnens
7bb9b6efa9 populate mine with network.ip_addrs pillar.host.mainint for each host prior to highstate 2022-01-04 10:27:45 -05:00
Mike Reeves
288389c93e Soup changes for 2.3.100 2022-01-04 08:38:14 -05:00
Mike Reeves
f82d204c0e Update soup 2021-12-03 15:20:33 -05:00
Mike Reeves
780daf8aa7 Apply hotfix to all 2.3.90 installs 2021-12-03 15:15:45 -05:00
m0duspwnens
c6773a0bbc move "Preparing soup" to main so shows in soup.log 2021-12-03 10:26:22 -05:00
m0duspwnens
ff2d2c7c04 export LC_CTYPE="en_US.UTF-8" - https://github.com/Security-Onion-Solutions/securityonion/discussions/6431 2021-12-02 16:39:32 -05:00
m0duspwnens
8d667795a7 only add soc:es_index_patterns to pillar if not already present 2021-12-02 10:28:17 -05:00
m0duspwnens
7a664ab8f7 more error proof up_to_2.3.90 function 2021-12-02 10:02:26 -05:00
m0duspwnens
5e0ac89841 merge with master 2021-12-01 14:27:58 -05:00
m0duspwnens
c571b2c499 handle redirect if more than 1 match from compgen 2021-12-01 13:17:14 -05:00
Josh Patterson
63cb486698 remove redirect to /dev/null for compgen 2021-12-01 10:16:04 -05:00
Jason Ertel
4f283c2d86 Suppres grep output 2021-11-23 14:52:40 -05:00
Jason Ertel
801d42ed20 Correct if check to inline the command instead of checking for emptiness of a variable 2021-11-23 14:51:06 -05:00
Jason Ertel
59fc122eec Force restart of wazuh since conf file is changing 2021-11-23 13:29:04 -05:00