Merge pull request #609 from dtag-dev-sec/dev

CDN, ELK
This commit is contained in:
Marco Ochse 2020-04-08 16:12:02 +02:00 committed by GitHub
commit 489de1854a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions

View file

@ -1,7 +1,7 @@
FROM alpine FROM alpine
# #
# VARS # VARS
ENV ES_VER=7.6.1 \ ENV ES_VER=7.6.2 \
JAVA_HOME=/usr/lib/jvm/java-11-openjdk JAVA_HOME=/usr/lib/jvm/java-11-openjdk
# Include dist # Include dist
ADD dist/ /root/dist/ ADD dist/ /root/dist/

View file

@ -1,7 +1,7 @@
FROM node:10.19.0-alpine FROM node:10.19.0-alpine
# #
# VARS # VARS
ENV KB_VER=7.6.1 ENV KB_VER=7.6.2
# #
# Include dist # Include dist
ADD dist/ /root/dist/ ADD dist/ /root/dist/

View file

@ -1,7 +1,7 @@
FROM alpine FROM alpine
# #
# VARS # VARS
ENV LS_VER=7.6.1 ENV LS_VER=7.6.2
# Include dist # Include dist
ADD dist/ /root/dist/ ADD dist/ /root/dist/
# #
@ -20,8 +20,8 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
# Get and install packages # Get and install packages
mkdir -p /etc/listbot && \ mkdir -p /etc/listbot && \
cd /etc/listbot && \ cd /etc/listbot && \
aria2c -s16 -x 16 https://raw.githubusercontent.com/dtag-dev-sec/listbot/master/cve.yaml.bz2 && \ aria2c -s16 -x 16 https://dtag-dev-sec.netlify.com/cve.yaml.bz2 && \
aria2c -s16 -x 16 https://raw.githubusercontent.com/dtag-dev-sec/listbot/master/iprep.yaml.bz2 && \ aria2c -s16 -x 16 https://dtag-dev-sec.netlify.com/iprep.yaml.bz2 && \
bunzip2 *.bz2 && \ bunzip2 *.bz2 && \
cd /root/dist/ && \ cd /root/dist/ && \
mkdir -p /usr/share/logstash/ && \ mkdir -p /usr/share/logstash/ && \
@ -36,7 +36,7 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
chmod u+x /usr/bin/update.sh && \ chmod u+x /usr/bin/update.sh && \
mkdir -p /etc/logstash/conf.d && \ mkdir -p /etc/logstash/conf.d && \
cp logstash.conf /etc/logstash/conf.d/ && \ cp logstash.conf /etc/logstash/conf.d/ && \
cp elasticsearch-template-es7x.json /usr/share/logstash/vendor/bundle/jruby/2.5.0/gems/logstash-output-elasticsearch-10.3.1-java/lib/logstash/outputs/elasticsearch/ && \ cp elasticsearch-template-es7x.json /usr/share/logstash/vendor/bundle/jruby/2.5.0/gems/logstash-output-elasticsearch-10.3.3-java/lib/logstash/outputs/elasticsearch/ && \
# #
# Setup user, groups and configs # Setup user, groups and configs
addgroup -g 2000 logstash && \ addgroup -g 2000 logstash && \

View file

@ -22,13 +22,13 @@ for i in $mySITES;
} }
# Check for connectivity and download latest translation maps # Check for connectivity and download latest translation maps
myCHECK=$(fuCHECKINET "raw.githubusercontent.com") myCHECK=$(fuCHECKINET "dtag-dev-sec.netlify.com")
if [ "$myCHECK" == "0" ]; if [ "$myCHECK" == "0" ];
then then
echo "Connection to Github looks good, now downloading latest translation maps." echo "Connection to Netlify looks good, now downloading latest translation maps."
cd /etc/listbot cd /etc/listbot
aria2c -s16 -x 16 https://raw.githubusercontent.com/dtag-dev-sec/listbot/master/cve.yaml.bz2 && \ aria2c -s16 -x 16 https://dtag-dev-sec.netlify.com/cve.yaml.bz2 && \
aria2c -s16 -x 16 https://raw.githubusercontent.com/dtag-dev-sec/listbot/master/iprep.yaml.bz2 && \ aria2c -s16 -x 16 https://dtag-dev-sec.netlify.com/iprep.yaml.bz2 && \
bunzip2 -f *.bz2 bunzip2 -f *.bz2
cd / cd /
else else