From a98e6bfc5367a9886c4a5d782c4860ae8c9391db Mon Sep 17 00:00:00 2001 From: Marco Ochse Date: Mon, 13 Mar 2017 00:38:43 +0000 Subject: [PATCH] prepare for 17.06 dev env --- installer/bin/update-images.sh | 2 +- installer/data/systemd/conpot.service | 2 +- installer/data/systemd/cowrie.service | 2 +- installer/data/systemd/dionaea.service | 2 +- installer/data/systemd/elasticpot.service | 2 +- installer/data/systemd/elk.service | 2 +- installer/data/systemd/emobility.service | 2 +- installer/data/systemd/ewsposter.service | 2 +- installer/data/systemd/glastopf.service | 2 +- installer/data/systemd/honeytrap.service | 2 +- installer/data/systemd/netdata.service | 2 +- installer/data/systemd/suricata.service | 2 +- installer/data/systemd/ui-for-docker.service | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/installer/bin/update-images.sh b/installer/bin/update-images.sh index 2aa1b8dc..94c09c9f 100755 --- a/installer/bin/update-images.sh +++ b/installer/bin/update-images.sh @@ -51,7 +51,7 @@ sleep 2 # Enable only T-Pot upstart scripts from images.conf and pull the images for i in $(cat /data/images.conf); do - docker pull dtagdevsec/$i:latest1610; + docker pull dtagdevsec/$i:1706; systemctl enable $i; done diff --git a/installer/data/systemd/conpot.service b/installer/data/systemd/conpot.service index bead577c..d36c7555 100644 --- a/installer/data/systemd/conpot.service +++ b/installer/data/systemd/conpot.service @@ -8,7 +8,7 @@ Restart=always ExecStartPre=-/usr/bin/docker stop conpot ExecStartPre=-/usr/bin/docker rm -v conpot ExecStartPre=/bin/bash -c '/usr/bin/clean.sh conpot off' -ExecStart=/usr/bin/docker run --name conpot --rm=true -v /data/conpot:/data/conpot -v /data/ews:/data/ews -p 1025:1025 -p 50100:50100 dtagdevsec/conpot:latest1610 +ExecStart=/usr/bin/docker run --name conpot --rm=true -v /data/conpot:/data/conpot -v /data/ews:/data/ews -p 1025:1025 -p 50100:50100 dtagdevsec/conpot:1706 ExecStop=/usr/bin/docker stop conpot [Install] diff --git a/installer/data/systemd/cowrie.service b/installer/data/systemd/cowrie.service index a5e435e4..ad70ab42 100644 --- a/installer/data/systemd/cowrie.service +++ b/installer/data/systemd/cowrie.service @@ -8,7 +8,7 @@ Restart=always ExecStartPre=-/usr/bin/docker stop cowrie ExecStartPre=-/usr/bin/docker rm -v cowrie ExecStartPre=/bin/bash -c '/usr/bin/clean.sh cowrie off' -ExecStart=/usr/bin/docker run --name cowrie --rm=true -p 22:2222 -p 23:2223 -v /data/cowrie:/data/cowrie -v /data/ews:/data/ews dtagdevsec/cowrie:latest1610 +ExecStart=/usr/bin/docker run --name cowrie --rm=true -p 22:2222 -p 23:2223 -v /data/cowrie:/data/cowrie -v /data/ews:/data/ews dtagdevsec/cowrie:1706 ExecStop=/usr/bin/docker stop cowrie [Install] diff --git a/installer/data/systemd/dionaea.service b/installer/data/systemd/dionaea.service index e36354ab..3455edeb 100644 --- a/installer/data/systemd/dionaea.service +++ b/installer/data/systemd/dionaea.service @@ -8,7 +8,7 @@ Restart=always ExecStartPre=-/usr/bin/docker stop dionaea ExecStartPre=-/usr/bin/docker rm -v dionaea ExecStartPre=/bin/bash -c '/usr/bin/clean.sh dionaea off' -ExecStart=/usr/bin/docker run --name dionaea --cap-add=NET_BIND_SERVICE --rm=true -p 21:21 -p 42:42 -p 69:69/udp -p 8081:80 -p 135:135 -p 443:443 -p 445:445 -p 1433:1433 -p 1723:1723 -p 1883:1883 -p 1900:1900 -p 3306:3306 -p 5060:5060 -p 5061:5061 -p 5060:5060/udp -p 11211:11211 -v /data/dionaea:/data/dionaea -v /data/ews:/data/ews dtagdevsec/dionaea:latest1610 +ExecStart=/usr/bin/docker run --name dionaea --cap-add=NET_BIND_SERVICE --rm=true -p 21:21 -p 42:42 -p 69:69/udp -p 8081:80 -p 135:135 -p 443:443 -p 445:445 -p 1433:1433 -p 1723:1723 -p 1883:1883 -p 1900:1900 -p 3306:3306 -p 5060:5060 -p 5061:5061 -p 5060:5060/udp -p 11211:11211 -v /data/dionaea:/data/dionaea -v /data/ews:/data/ews dtagdevsec/dionaea:1706 ExecStop=/usr/bin/docker stop dionaea [Install] diff --git a/installer/data/systemd/elasticpot.service b/installer/data/systemd/elasticpot.service index 7b4e2179..da068b9d 100644 --- a/installer/data/systemd/elasticpot.service +++ b/installer/data/systemd/elasticpot.service @@ -8,7 +8,7 @@ Restart=always ExecStartPre=-/usr/bin/docker stop elasticpot ExecStartPre=-/usr/bin/docker rm -v elasticpot ExecStartPre=/bin/bash -c '/usr/bin/clean.sh elasticpot off' -ExecStart=/usr/bin/docker run --name elasticpot --rm=true -v /data/elasticpot:/data/elasticpot -v /data/ews:/data/ews -p 9200:9200 dtagdevsec/elasticpot:latest1610 +ExecStart=/usr/bin/docker run --name elasticpot --rm=true -v /data/elasticpot:/data/elasticpot -v /data/ews:/data/ews -p 9200:9200 dtagdevsec/elasticpot:1706 ExecStop=/usr/bin/docker stop elasticpot [Install] diff --git a/installer/data/systemd/elk.service b/installer/data/systemd/elk.service index 347faa94..c4698ff9 100644 --- a/installer/data/systemd/elk.service +++ b/installer/data/systemd/elk.service @@ -8,7 +8,7 @@ Restart=always ExecStartPre=-/usr/bin/docker stop elk ExecStartPre=-/usr/bin/docker rm -v elk ExecStartPre=/bin/bash -c '/usr/bin/clean.sh elk' -ExecStart=/usr/bin/docker run --cap-add=IPC_LOCK --ulimit memlock=-1:-1 --ulimit nofile=65536:65536 --name=elk -v /data:/data -p 127.0.0.1:64296:5601 -p 127.0.0.1:64302:9100 -p 127.0.0.1:64298:9200 --rm=true dtagdevsec/elk:latest1610 +ExecStart=/usr/bin/docker run --cap-add=IPC_LOCK --ulimit memlock=-1:-1 --ulimit nofile=65536:65536 --name=elk -v /data:/data -p 127.0.0.1:64296:5601 -p 127.0.0.1:64302:9100 -p 127.0.0.1:64298:9200 --rm=true dtagdevsec/elk:1706 ExecStop=/usr/bin/docker stop elk [Install] diff --git a/installer/data/systemd/emobility.service b/installer/data/systemd/emobility.service index 924fe9aa..465a639d 100644 --- a/installer/data/systemd/emobility.service +++ b/installer/data/systemd/emobility.service @@ -8,7 +8,7 @@ Restart=always ExecStartPre=-/usr/bin/docker stop emobility ExecStartPre=-/usr/bin/docker rm -v emobility ExecStartPre=/bin/bash -c '/usr/bin/clean.sh emobility off' -ExecStart=/usr/bin/docker run --name emobility --cap-add=NET_ADMIN -p 8080:8080 -v /data/emobility:/data/eMobility -v /data/ews:/data/ews --rm=true dtagdevsec/emobility:latest1610 +ExecStart=/usr/bin/docker run --name emobility --cap-add=NET_ADMIN -p 8080:8080 -v /data/emobility:/data/eMobility -v /data/ews:/data/ews --rm=true dtagdevsec/emobility:1706 ExecStop=/usr/bin/docker stop emobility [Install] diff --git a/installer/data/systemd/ewsposter.service b/installer/data/systemd/ewsposter.service index ce18242b..3979aa2f 100644 --- a/installer/data/systemd/ewsposter.service +++ b/installer/data/systemd/ewsposter.service @@ -7,7 +7,7 @@ After=docker.service Restart=always ExecStartPre=-/usr/bin/docker stop ewsposter ExecStartPre=-/usr/bin/docker rm -v ewsposter -ExecStart=/usr/bin/docker run --name ewsposter --rm=true -v /data:/data -v /data/ews/conf/ews.ip:/opt/ewsposter/ews.ip dtagdevsec/ewsposter:latest1610 +ExecStart=/usr/bin/docker run --name ewsposter --rm=true -v /data:/data -v /data/ews/conf/ews.ip:/opt/ewsposter/ews.ip dtagdevsec/ewsposter:1706 ExecStop=/usr/bin/docker stop ewsposter [Install] diff --git a/installer/data/systemd/glastopf.service b/installer/data/systemd/glastopf.service index ae044010..2f256fe6 100644 --- a/installer/data/systemd/glastopf.service +++ b/installer/data/systemd/glastopf.service @@ -8,7 +8,7 @@ Restart=always ExecStartPre=-/usr/bin/docker stop glastopf ExecStartPre=-/usr/bin/docker rm -v glastopf ExecStartPre=/bin/bash -c '/usr/bin/clean.sh glastopf off' -ExecStart=/usr/bin/docker run --name glastopf --rm=true -v /data/glastopf:/data/glastopf -v /data/ews:/data/ews -p 80:80 dtagdevsec/glastopf:latest1610 +ExecStart=/usr/bin/docker run --name glastopf --rm=true -v /data/glastopf:/data/glastopf -v /data/ews:/data/ews -p 80:80 dtagdevsec/glastopf:1706 ExecStop=/usr/bin/docker stop glastopf [Install] diff --git a/installer/data/systemd/honeytrap.service b/installer/data/systemd/honeytrap.service index aadd08d9..5747ed98 100644 --- a/installer/data/systemd/honeytrap.service +++ b/installer/data/systemd/honeytrap.service @@ -12,7 +12,7 @@ ExecStartPre=/sbin/iptables -w -A INPUT -p tcp --syn -m state --state NEW -m mul ExecStartPre=/sbin/iptables -w -A INPUT -p tcp --syn -m state --state NEW -m multiport ! --dports 3306,5060,5061,5601,11211 -j NFQUEUE ExecStartPre=/sbin/iptables -w -A INPUT -p tcp --syn -m state --state NEW -m multiport ! --dports 64295,64296,64297,64298,64299,64300,64301 -j NFQUEUE ExecStartPre=/sbin/iptables -w -A INPUT -p tcp --syn -m state --state NEW -m multiport ! --dports 1025,50100,8080,8081,9200 -j NFQUEUE -ExecStart=/usr/bin/docker run --name honeytrap --cap-add=NET_ADMIN --net=host --rm=true -v /data/honeytrap:/data/honeytrap -v /data/ews:/data/ews dtagdevsec/honeytrap:latest1610 +ExecStart=/usr/bin/docker run --name honeytrap --cap-add=NET_ADMIN --net=host --rm=true -v /data/honeytrap:/data/honeytrap -v /data/ews:/data/ews dtagdevsec/honeytrap:1706 ExecStop=/usr/bin/docker stop honeytrap ExecStopPost=/sbin/iptables -w -D INPUT -p tcp --syn -m state --state NEW -m multiport ! --dports 1025,50100,8080,8081,9200 -j NFQUEUE ExecStopPost=/sbin/iptables -w -D INPUT -p tcp --syn -m state --state NEW -m multiport ! --dports 64295,64296,64297,64298,64299,64300,64301 -j NFQUEUE diff --git a/installer/data/systemd/netdata.service b/installer/data/systemd/netdata.service index ccf7ca5c..a372d6e5 100644 --- a/installer/data/systemd/netdata.service +++ b/installer/data/systemd/netdata.service @@ -8,7 +8,7 @@ Restart=always ExecStartPre=-/usr/bin/docker stop netdata ExecStartPre=-/usr/bin/docker rm -v netdata ExecStartPre=-/bin/chmod 666 /var/run/docker.sock -ExecStart=/usr/bin/docker run --name netdata --net=host --cap-add=SYS_PTRACE --rm=true -v /proc:/host/proc:ro -v /sys:/host/sys:ro -v /var/run/docker.sock:/var/run/docker.sock dtagdevsec/netdata:latest1610 +ExecStart=/usr/bin/docker run --name netdata --net=host --cap-add=SYS_PTRACE --rm=true -v /proc:/host/proc:ro -v /sys:/host/sys:ro -v /var/run/docker.sock:/var/run/docker.sock dtagdevsec/netdata:1706 ExecStop=/usr/bin/docker stop netdata [Install] diff --git a/installer/data/systemd/suricata.service b/installer/data/systemd/suricata.service index c5accd93..99a9cff6 100644 --- a/installer/data/systemd/suricata.service +++ b/installer/data/systemd/suricata.service @@ -12,7 +12,7 @@ ExecStartPre=/bin/bash -c '/sbin/ethtool --offload $(/sbin/ip route | /bin/grep ExecStartPre=/bin/bash -c '/sbin/ethtool -K $(/sbin/ip route | /bin/grep $(/bin/hostname -I | /usr/bin/awk \'{print $1 }\') | /usr/bin/awk \'{print $3 }\') gso off gro off' ExecStartPre=/bin/bash -c '/sbin/ip link set $(/sbin/ip route | /bin/grep $(/bin/hostname -I | /usr/bin/awk \'{print $1 }\') | /usr/bin/awk \'{print $3 }\') promisc on' ExecStartPre=/bin/bash -c '/usr/bin/clean.sh suricata off' -ExecStart=/usr/bin/docker run --name suricata --cap-add=NET_ADMIN --net=host --rm=true -v /data/suricata:/data/suricata dtagdevsec/suricata:latest1610 +ExecStart=/usr/bin/docker run --name suricata --cap-add=NET_ADMIN --net=host --rm=true -v /data/suricata:/data/suricata dtagdevsec/suricata:1706 ExecStop=/usr/bin/docker stop suricata [Install] diff --git a/installer/data/systemd/ui-for-docker.service b/installer/data/systemd/ui-for-docker.service index 0fd35b5d..9dcd1de0 100644 --- a/installer/data/systemd/ui-for-docker.service +++ b/installer/data/systemd/ui-for-docker.service @@ -7,7 +7,7 @@ After=docker.service Restart=always ExecStartPre=-/usr/bin/docker stop ui-for-docker ExecStartPre=-/usr/bin/docker rm -v ui-for-docker -ExecStart=/usr/bin/docker run --name ui-for-docker --rm=true -v /var/run/docker.sock:/var/run/docker.sock -p 127.0.0.1:64299:9000 dtagdevsec/ui-for-docker:latest1610 +ExecStart=/usr/bin/docker run --name ui-for-docker --rm=true -v /var/run/docker.sock:/var/run/docker.sock -p 127.0.0.1:64299:9000 dtagdevsec/ui-for-docker:1706 ExecStop=/usr/bin/docker stop ui-for-docker [Install]