Several changes and updated formatting

* Update ElasticSearch and Kibana version
* Remove nginx config and cert generation for use of
  reverse proxy on host
* Replace geoip updater with crazymax image
* Update formatting to have unix line endings
* Rename docker-compose.yml to compose.yml
* Add explicit network to compose.yml for use with ipv6 (optional)
This commit is contained in:
Manuel 2021-10-17 20:33:59 +02:00
parent af71a46479
commit dd4bbc4b22
Signed by: Manuel
GPG key ID: 4085037435E1F07A
6 changed files with 126 additions and 168 deletions

View file

@ -1,8 +1,8 @@
FROM alpine:latest
ADD start.sh /start.sh
RUN apk add --no-cache curl openssl jq bash \
&& chmod +x /start.sh
ENTRYPOINT [ "/start.sh" ]
FROM alpine:latest
ADD start.sh /start.sh
RUN apk add --no-cache curl jq bash \
&& chmod +x /start.sh
ENTRYPOINT [ "/start.sh" ]

View file

@ -8,16 +8,6 @@ echo "Setting permissions..."
chmod g+rwx -R /usr/share/elasticsearch/data/
chgrp 0 -R /usr/share/elasticsearch/data/
echo "## NGINX"
echo "Checking nginx certs..."
cd /etc/nginx/ssl/
if [ ! -f "/etc/nginx/ssl/kibana.crt" ] || [ ! -f "/etc/nginx/ssl/kibana.key" ]; then
echo "No certs found. Generating..."
openssl req -x509 -nodes -days 365 -newkey rsa:3072 -keyout kibana.key -out kibana.crt \
-subj "/CN=parsedmarc" -addext "subjectAltName=DNS:parsedmarc"
echo "Certs generated."
fi
echo "## KIBANA"
exportFile="/etc/parsedmarc/kibana_export.ndjson"
if [ ! -f "${exportFile}" ]; then