diff --git a/installer/data/systemd/netdata.service b/installer/data/systemd/netdata.service index f6e1abfa..ccf7ca5c 100644 --- a/installer/data/systemd/netdata.service +++ b/installer/data/systemd/netdata.service @@ -7,6 +7,7 @@ After=docker.service 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 ExecStop=/usr/bin/docker stop netdata diff --git a/installer/install.sh b/installer/install.sh index 9ee0cc20..130bf0c1 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -3,7 +3,7 @@ # T-Pot post install script # # Ubuntu server 16.04.0, x64 # # # -# v16.10.0 by mo, DTAG, 2016-10-28 # +# v16.10.0 by mo, DTAG, 2016-12-03 # ######################################################## # Some global vars @@ -274,23 +274,6 @@ fuECHO "### Installing wetty." ln -s /usr/bin/nodejs /usr/bin/node npm install https://github.com/t3chn0m4g3/wetty -g -# Let's add the docker repository -fuECHO "### Adding the docker repository." -apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D -tee /etc/apt/sources.list.d/docker.list <