From d4654f2bbcbaec4343bf527f40ecdb5c3509b7d0 Mon Sep 17 00:00:00 2001 From: t3chn0m4g3 Date: Mon, 1 Apr 2019 07:42:24 +0000 Subject: [PATCH] prepare for hpfeeds opt in --- docker/ews/Dockerfile | 2 +- docker/ews/dist/{ca.pem => sissden.pem} | 0 etc/compose/collector.yml | 2 +- etc/compose/industrial.yml | 2 +- etc/compose/nextgen.yml | 2 +- etc/compose/sensor.yml | 2 +- etc/compose/standard.yml | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename docker/ews/dist/{ca.pem => sissden.pem} (100%) diff --git a/docker/ews/Dockerfile b/docker/ews/Dockerfile index da8f0561..f2224c3b 100644 --- a/docker/ews/Dockerfile +++ b/docker/ews/Dockerfile @@ -36,7 +36,7 @@ RUN apk -U --no-cache add \ # Supply configs mv /root/dist/ews.cfg /opt/ewsposter/ && \ - mv /root/dist/ca.pem /opt/ewsposter/ && \ + mv /root/dist/*.pem /opt/ewsposter/ && \ # Clean up apk del build-base \ diff --git a/docker/ews/dist/ca.pem b/docker/ews/dist/sissden.pem similarity index 100% rename from docker/ews/dist/ca.pem rename to docker/ews/dist/sissden.pem diff --git a/etc/compose/collector.yml b/etc/compose/collector.yml index 5af318a8..5505bb93 100644 --- a/etc/compose/collector.yml +++ b/etc/compose/collector.yml @@ -178,7 +178,7 @@ services: - EWS_HPFEEDS_CHANNELS=channels - EWS_HPFEEDS_IDENT=user - EWS_HPFEEDS_SECRET=secret - - EWS_HPFEEDS_TLSCERT=/opt/ewsposter/ca.pem + - EWS_HPFEEDS_TLSCERT=false - EWS_HPFEEDS_FORMAT=json env_file: - /opt/tpot/etc/compose/elk_environment diff --git a/etc/compose/industrial.yml b/etc/compose/industrial.yml index 575e8d67..142892da 100644 --- a/etc/compose/industrial.yml +++ b/etc/compose/industrial.yml @@ -355,7 +355,7 @@ services: - EWS_HPFEEDS_CHANNELS=channels - EWS_HPFEEDS_IDENT=user - EWS_HPFEEDS_SECRET=secret - - EWS_HPFEEDS_TLSCERT=/opt/ewsposter/ca.pem + - EWS_HPFEEDS_TLSCERT=false - EWS_HPFEEDS_FORMAT=json env_file: - /opt/tpot/etc/compose/elk_environment diff --git a/etc/compose/nextgen.yml b/etc/compose/nextgen.yml index 0a74dcdd..ec037eec 100644 --- a/etc/compose/nextgen.yml +++ b/etc/compose/nextgen.yml @@ -522,7 +522,7 @@ services: - EWS_HPFEEDS_CHANNELS=channels - EWS_HPFEEDS_IDENT=user - EWS_HPFEEDS_SECRET=secret - - EWS_HPFEEDS_TLSCERT=/opt/ewsposter/ca.pem + - EWS_HPFEEDS_TLSCERT=false - EWS_HPFEEDS_FORMAT=json env_file: - /opt/tpot/etc/compose/elk_environment diff --git a/etc/compose/sensor.yml b/etc/compose/sensor.yml index 068d378a..17e76d2f 100644 --- a/etc/compose/sensor.yml +++ b/etc/compose/sensor.yml @@ -441,7 +441,7 @@ services: - EWS_HPFEEDS_CHANNELS=channels - EWS_HPFEEDS_IDENT=user - EWS_HPFEEDS_SECRET=secret - - EWS_HPFEEDS_TLSCERT=/opt/ewsposter/ca.pem + - EWS_HPFEEDS_TLSCERT=false - EWS_HPFEEDS_FORMAT=json env_file: - /opt/tpot/etc/compose/elk_environment diff --git a/etc/compose/standard.yml b/etc/compose/standard.yml index 2dce4789..be0c2e3f 100644 --- a/etc/compose/standard.yml +++ b/etc/compose/standard.yml @@ -514,7 +514,7 @@ services: - EWS_HPFEEDS_CHANNELS=channels - EWS_HPFEEDS_IDENT=user - EWS_HPFEEDS_SECRET=secret - - EWS_HPFEEDS_TLSCERT=/opt/ewsposter/ca.pem + - EWS_HPFEEDS_TLSCERT=false - EWS_HPFEEDS_FORMAT=json env_file: - /opt/tpot/etc/compose/elk_environment