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

Dev
This commit is contained in:
Marco Ochse 2020-05-12 11:26:00 +02:00 committed by GitHub
commit cd973301fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 10 deletions

View file

@ -20,8 +20,8 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
# Get and install packages
mkdir -p /etc/listbot && \
cd /etc/listbot && \
aria2c -s16 -x 16 http://80.158.38.137/cve.yaml.bz2 && \
aria2c -s16 -x 16 http://80.158.38.137/iprep.yaml.bz2 && \
aria2c -s16 -x 16 https://listbot.sicherheitstacho.eu/cve.yaml.bz2 && \
aria2c -s16 -x 16 https://listbot.sicherheitstacho.eu/iprep.yaml.bz2 && \
bunzip2 *.bz2 && \
cd /root/dist/ && \
mkdir -p /usr/share/logstash/ && \

View file

@ -22,17 +22,17 @@ for i in $mySITES;
}
# Check for connectivity and download latest translation maps
myCHECK=$(fuCHECKINET "dtag-dev-sec.netlify.com")
myCHECK=$(fuCHECKINET "listbot.sicherheitstacho.eu")
if [ "$myCHECK" == "0" ];
then
echo "Connection to Netlify looks good, now downloading latest translation maps."
echo "Connection to Listbot looks good, now downloading latest translation maps."
cd /etc/listbot
aria2c -s16 -x 16 https://dtag-dev-sec.netlify.com/cve.yaml.bz2 && \
aria2c -s16 -x 16 https://dtag-dev-sec.netlify.com/iprep.yaml.bz2 && \
aria2c -s16 -x 16 https://listbot.sicherheitstacho.eu/cve.yaml.bz2 && \
aria2c -s16 -x 16 https://listbot.sicherheitstacho.eu/iprep.yaml.bz2 && \
bunzip2 -f *.bz2
cd /
else
echo "Cannot reach Github, starting Logstash without latest translation maps."
echo "Cannot reach Listbot, starting Logstash without latest translation maps."
fi
# Make sure logstash can put latest logstash template by deleting the old one first

View file

@ -1,4 +1,4 @@
FROM alpine:latest
FROM alpine:3.10
#
# Include dist
ADD dist/ /root/dist/
@ -9,6 +9,7 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
build-base \
git \
libcap \
py2-markupsafe \
python2 \
python2-dev \
py2-pip \

View file

@ -4,7 +4,8 @@ FROM alpine:latest
ADD dist/ /root/dist/
#
# Install packages
RUN apk -U --no-cache add \
RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
apk -U --no-cache add \
ca-certificates \
curl \
file \

View file

@ -1,3 +1,3 @@
not (host sicherheitstacho.eu or community.sicherheitstacho.eu) and
not (host sicherheitstacho.eu or community.sicherheitstacho.eu or listbot.sicherheitstacho.eu) and
not (host deb.debian.org) and
not (host index.docker.io or docker.io)