jruby ssl fun

This commit is contained in:
Mike Reeves
2020-08-07 23:28:58 -04:00
parent 62a6f29c96
commit 5525e235d1
5 changed files with 2019 additions and 176 deletions

View File

@@ -22,7 +22,11 @@
if [ ! -f /opt/so/saltstack/local/salt/common/cacerts ]; then if [ ! -f /opt/so/saltstack/local/salt/common/cacerts ]; then
docker run -v /etc/pki/ca.crt:/etc/pki/ca.crt --name so-elasticsearchca --user root --entrypoint keytool {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-logstash:{{ VERSION }} -keystore /etc/pki/ca-trust/extracted/java/cacerts -alias SOSCA -import -file /etc/pki/ca.crt -storepass changeit -noprompt docker run -v /etc/pki/ca.crt:/etc/pki/ca.crt --name so-elasticsearchca --user root --entrypoint keytool {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-logstash:{{ VERSION }} -keystore /etc/pki/ca-trust/extracted/java/cacerts -alias SOSCA -import -file /etc/pki/ca.crt -storepass changeit -noprompt
docker cp so-elasticsearchca:/etc/pki/ca-trust/extracted/java/cacerts /opt/so/saltstack/local/salt/common/cacerts docker cp so-elasticsearchca:/etc/pki/ca-trust/extracted/java/cacerts /opt/so/saltstack/local/salt/common/cacerts
docker cp so-elasticsearchca:/etc/pki/tls/certs/ca-bundle.crt /opt/so/saltstack/local/salt/common/ca-bundle.crt
docker rm so-elasticsearchca docker rm so-elasticsearchca
echo "" >> /opt/so/saltstack/local/salt/common/ca-bundle.crt
echo "sosca" >> /opt/so/saltstack/local/salt/common/ca-bundle.crt
echo /etc/pki/ca.crt >> /opt/so/saltstack/local/salt/common/ca-bundle.crt
else else
exit 0 exit 0
fi fi

View File

@@ -64,6 +64,7 @@ firewall:
redis: redis:
tcp: tcp:
- 6379 - 6379
- 6380
salt_manager: salt_manager:
tcp: tcp:
- 4505 - 4505

View File

@@ -3,11 +3,13 @@
output { output {
redis { redis {
host => '{{ MANAGER }}' host => '{{ MANAGER }}'
port => 6380
data_type => 'list' data_type => 'list'
key => 'logstash:unparsed' key => 'logstash:unparsed'
congestion_interval => 1 congestion_interval => 1
congestion_threshold => 50000000 congestion_threshold => 50000000
batch => true batch => true
batch_events => {{ BATCH }} batch_events => {{ BATCH }}
ssl => true
} }
} }

File diff suppressed because it is too large Load Diff

1316
salt/redis/etc/redis.conf.5 Normal file

File diff suppressed because it is too large Load Diff