diff --git a/config/config.cfg.default b/config/config.cfg.default index 423dfcb..9a64e81 100644 --- a/config/config.cfg.default +++ b/config/config.cfg.default @@ -55,7 +55,8 @@ channelLastAwards = lastAwards [RedisMap] db=1 channelDisp=PicToDisplay -pathMaxMindDB=./data/GeoLite2-City_20171003/GeoLite2-City.mmdb +# Database updates regularly make sure to adapt date +pathMaxMindDB=./data/GeoLite2-City_20180102/GeoLite2-City.mmdb path_countrycode_to_coord_JSON=./data/country_code_lat_long.json [RedisDB] diff --git a/start_all.sh b/start_all.sh index 1296c21..507b831 100755 --- a/start_all.sh +++ b/start_all.sh @@ -6,10 +6,17 @@ GREEN="\\033[1;32m" DEFAULT="\\033[0;39m" RED="\\033[1;31m" -[ -z "$DASH_HOME" ] && echo "Needs the env var DASHENV. Run the script from the virtual environment." && exit 1; +[ -z "$DASH_HOME" ] && echo "Needs the env var DASHENV. (Did you: . ./DASHENV/bin/activate ) Please run the script from the virtual environment." && exit 1; + +redis_dir="${DASH_HOME}/../redis/src/" +if [ -e "${redis_dir}" ]; then + redis_dir="" +fi + +[ -f "`which redis-server`" ] || [ ! -e "${redis_dir}" ] && echo "Either ${DASH_HOME}/../redis/src/ does not exist or 'redis-server' is not installed/not on PATH. Please fix and run again." && exit 1 conf_dir="${DASH_HOME}/config/" -redis_dir="${DASH_HOME}/../redis/src/" + screenName="Misp-Dashboard" screen -dmS "$screenName"