Merge pull request #47 from SteveClement/master

- Made sure GeoLite is a symlink (thus GeoLite updates do not face…
pull/54/head
Steve Clement 2018-03-16 01:05:36 +09:00 committed by GitHub
commit fc921febef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 1 deletions

View File

@ -16,6 +16,27 @@ An experimental dashboard showing live data and statistics from the ZMQ of one o
- Re-launch ```./install_dependencies.sh``` to fetch new required dependencies
- Re-update your configuration file ```config.cfg```
:warning: Make sure no zmq python3 scripts are running. They block the update.
`python
+ virtualenv -p python3 DASHENV
Already using interpreter /usr/bin/python3
Using base prefix '/usr'
New python executable in /home/steve/code/misp-dashboard/DASHENV/bin/python3
Traceback (most recent call last):
File "/usr/bin/virtualenv", line 9, in <module>
load_entry_point('virtualenv==15.0.1', 'console_scripts', 'virtualenv')()
File "/usr/lib/python3/dist-packages/virtualenv.py", line 719, in main
symlink=options.symlink)
File "/usr/lib/python3/dist-packages/virtualenv.py", line 942, in create_environment
site_packages=site_packages, clear=clear, symlink=symlink))
File "/usr/lib/python3/dist-packages/virtualenv.py", line 1261, in install_python
shutil.copyfile(executable, py_executable)
File "/usr/lib/python3.5/shutil.py", line 115, in copyfile
with open(dst, 'wb') as fdst:
OSError: [Errno 26] Text file busy: '/home/steve/code/misp-dashboard/DASHENV/bin/python3'
`
# Starting the System
/!\ You do not need to run it as root. Normal privileges are fine.

View File

@ -56,7 +56,7 @@ channelLastAwards = lastAwards
db=1
channelDisp=PicToDisplay
# Database updates regularly make sure to adapt date
pathMaxMindDB=./data/GeoLite2-City_20180102/GeoLite2-City.mmdb
pathMaxMindDB=./data/GeoLite2-City/GeoLite2-City.mmdb
path_countrycode_to_coord_JSON=./data/country_code_lat_long.json
[RedisDB]

View File

@ -25,6 +25,8 @@ if [ -e "config/config.cfg" ]; then
echo "Your config has changes, giving you a chance to see the changes and decide if you want to overwrite"
cp -i config/config.cfg.default config/config.cfg
fi
else
cp -i config/config.cfg.default config/config.cfg
fi
## Web stuff
@ -93,10 +95,12 @@ mv temp/jquery-jvectormap-2.0.3.min.js ./static/js
wget http://jvectormap.com/js/jquery-jvectormap-world-mill.js -O ./static/js/jquery-jvectormap-world-mill.js
# maxmind DB
rm -rf data/GeoLite2-City*
mkdir -p data
pushd data
wget http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz -O GeoLite2-City.tar.gz
tar xvfz GeoLite2-City.tar.gz
ln -s GeoLite2-City_* GeoLite2-City
rm -rf GeoLite2-City.tar.gz
popd