From c545e9045da54b2e97cc6483fec46b23d984ebf5 Mon Sep 17 00:00:00 2001
From: tjinjin <tjinjinprogram@gmail.com>
Date: Tue, 30 Aug 2016 23:38:30 +0900
Subject: [PATCH] Fix: setup vulsrepo

---
 setup/docker/dockerfile/Dockerfile                   | 4 ++--
 setup/docker/dockerfile/scripts/scan_for_vulsrepo.sh | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/setup/docker/dockerfile/Dockerfile b/setup/docker/dockerfile/Dockerfile
index c427108c..625658eb 100644
--- a/setup/docker/dockerfile/Dockerfile
+++ b/setup/docker/dockerfile/Dockerfile
@@ -63,11 +63,11 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/* \
   && cd /var/www/html/ \
   && git clone https://github.com/usiusi360/vulsrepo \
+  && mkdir /var/www/html/vulsrepo/results \
   && cp /var/www/html/vulsrepo/dist/cgi/vulsrepo.conf.sample /etc/apache2/conf-enabled/vulsrepo.conf \
   && a2enmod cgid
 
 #Home
+WORKDIR /opt/vuls
 EXPOSE 80 443
 ENTRYPOINT service apache2 start && tail -f /dev/null
-
-
diff --git a/setup/docker/dockerfile/scripts/scan_for_vulsrepo.sh b/setup/docker/dockerfile/scripts/scan_for_vulsrepo.sh
index 50b797c7..c3c43161 100644
--- a/setup/docker/dockerfile/scripts/scan_for_vulsrepo.sh
+++ b/setup/docker/dockerfile/scripts/scan_for_vulsrepo.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 VULS_ROOT=/opt/vuls
 VULS_CONF=${VULS_ROOT}/conf
-NGINX_VULSREPO_ROOT=/usr/share/nginx/html/vulsrepo
+APACHE_VULSREPO_ROOT=/var/www/html/vulsrepo
 cd $VULS_ROOT
-vuls scan -report-json --cve-dictionary-dbpath=${VULS_ROOT}/cve.sqlite3 -config=${VULS_CONF}/config.toml 
-ln -sf ${VULS_ROOT}/results ${NGINX_VULSREPO_ROOT}/results
+vuls scan -report-json --cve-dictionary-dbpath=${VULS_ROOT}/cve.sqlite3 -config=${VULS_CONF}/config.toml
+rm ${APACHE_VULSREPO_ROOT}/results/*
+cp ${VULS_ROOT}/results/current/* ${APACHE_VULSREPO_ROOT}/results