From ef4b2a6d3a6ce47ce691b0db983581b261856b57 Mon Sep 17 00:00:00 2001 From: gorgobacka Date: Sat, 30 May 2020 20:43:37 +0200 Subject: [PATCH 1/5] fix headlines --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8056290c..8c13ed00 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ pom.xml -- frontend -- pom.xml ``` -#MVN command +## MVN command ```shell script To clean: @@ -198,7 +198,7 @@ Info: So far only filtered data is pushed into the database. } } ``` -##Region Import +## Region Import Region is imported by parsing Folder path of ride or profile file. Its important to keep Rides and Profiles under City name. From 58d1253760b31bac99d6201705aeb91d7848e340 Mon Sep 17 00:00:00 2001 From: 7imo Date: Fri, 12 Jun 2020 13:31:37 +0200 Subject: [PATCH 2/5] update pom --- backend/SimRa-Visualization-API/pom.xml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/backend/SimRa-Visualization-API/pom.xml b/backend/SimRa-Visualization-API/pom.xml index f9f6b642..4effde85 100644 --- a/backend/SimRa-Visualization-API/pom.xml +++ b/backend/SimRa-Visualization-API/pom.xml @@ -152,16 +152,17 @@ osgeo - Open Source Geospatial Foundation Repository - http://download.osgeo.org/webdav/geotools/ + OSGeo Release Repository + https://repo.osgeo.org/repository/release/ + false + true - - true - - boundless - Boundless Maven Repository - http://repo.boundlessgeo.com/main + osgeo-snapshot + OSGeo Snapshot Repository + https://repo.osgeo.org/repository/snapshot/ + true + false From b117dbc235a6d139d5e534baa57e205af0b045b1 Mon Sep 17 00:00:00 2001 From: selphiron Date: Thu, 16 Jul 2020 19:00:42 +0200 Subject: [PATCH 3/5] Update install.sh fixed wrong variable name monitordir to monitorpath --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index fe9ea1f5..ea0e08a7 100755 --- a/install.sh +++ b/install.sh @@ -5,7 +5,7 @@ set -e echo Please enter server name, ex: yourserver.com: read servername echo Please specify the directory to be monitored by the importer: -read monitordir +read monitorpath echo Please specify the directory for the pbf files: read pbffiles echo Please specify the logging directory: From b6944f4935a7a3b4e49d4742ab583393285be60f Mon Sep 17 00:00:00 2001 From: selphiron Date: Fri, 17 Jul 2020 11:43:32 +0200 Subject: [PATCH 4/5] Create alternative_install.sh --- alternative_install.sh | 135 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 alternative_install.sh diff --git a/alternative_install.sh b/alternative_install.sh new file mode 100644 index 00000000..3912e848 --- /dev/null +++ b/alternative_install.sh @@ -0,0 +1,135 @@ +#!/bin/bash +set -e + +#get info from user +echo Please enter server name, ex: yourserver.com: +read servername +echo Please specify the directory to be monitored by the importer: +read monitorpath +echo Please specify the directory for the pbf files: +read pbffiles +echo Please specify the logging directory: +read loggingdir +echo Please specify the user you want to run the java applications on: +read javauser + +#add required repositories +sudo apt-get install software-properties-common +sudo apt-add-repository universe +sudo apt update + +#install nginx +sudo apt install nginx -y + +#install java + maven +sudo apt-get install default-jre -y +sudo apt-get install default-jdk -y +sudo apt install maven -y + +#install nodejs +curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash - +sudo apt-get install -y nodejs + +#install mongodb +. /etc/lsb-release +sudo apt-get install gnupg -y +wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | sudo apt-key add - +if [ "$DISTRIB_CODENAME" = "xenial" ] +then + echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/4.2 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.2.list +else + echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.2.list +fi +sudo apt update +sudo apt install mongodb-org -y +sudo systemctl daemon-reload +sudo systemctl start mongod + +#install git +sudo apt install git -y + +#clone repository +git clone https://github.com/simra-project/SimRa-Visualization.git +cd SimRa-Visualization + +#update configuration of CSV importer +sudo cat <> backend/csvimporter/src/main/resources/application.properties +csv.monitor.path=$monitorpath +pbf.path=$pbffiles +logging.file.name=$loggingdir/csvimporter.log +EOT + +#compile jars +sudo mvn clean install -DskipTests + +#import dump +mongorestore + +#compile frontend +cd frontend +npm install +npm run build +cd .. + +#configure and start frontend +sudo sed -i 's/# server_names_hash_bucket_size 64;/server_names_hash_bucket_size 256;/g' /etc/nginx/nginx.conf +sudo cat < ./simra.conf +server { + listen 80; + server_name $servername; + + # Tell Nginx where your app's 'public' directory is + root `pwd`/frontend/dist; + + location / { + try_files \$uri \$uri/ /index.html; + } +} +EOT +sudo mv ./simra.conf /etc/nginx/sites-enabled/simra.conf +sudo service nginx restart + +#configure and start interface +sudo cat < ./simra_api.service +[Unit] +Description=Simra Springboot API +After=syslog.target +After=network.target + +[Service] +ExecStart=/usr/bin/java -jar `pwd`/backend/SimRa-Visualization-API/target/SimRa-Visualization-API-1.0-SNAPSHOT.jar +Restart=always +StandardOutput=syslog +StandardError=syslog +SyslogIdentifier=simra_api +User=$javauser +Type=simple + +[Install] +WantedBy=multi-user.target +EOT +sudo mv ./simra_api.service /etc/systemd/system/simra_api.service +sudo systemctl start simra_api + +#configure and start backend + +sudo cat < ./simra_backend.service +[Unit] +Description=Simra Springboot API +After=syslog.target +After=network.target + +[Service] +ExecStart=/usr/bin/java -jar `pwd`/backend/csvimporter/target/csvimporter-0.0.1-SNAPSHOT.jar +Restart=always +StandardOutput=syslog +StandardError=syslog +SyslogIdentifier=simra_backend +User=$javauser +Type=simple + +[Install] +WantedBy=multi-user.target +EOT +sudo mv ./simra_backend.service /etc/systemd/system/simra_backend.service +sudo systemctl start simra_backend From bd70258958abaf6eb25419e8763e975c574c567f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Oct 2020 19:27:39 +0000 Subject: [PATCH 5/5] Bump junit from 4.11 to 4.13.1 in /backend/SimRa-Visualization-API Bumps [junit](https://github.com/junit-team/junit4) from 4.11 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.11.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.11...r4.13.1) Signed-off-by: dependabot[bot] --- backend/SimRa-Visualization-API/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/SimRa-Visualization-API/pom.xml b/backend/SimRa-Visualization-API/pom.xml index 4effde85..c3fec87f 100644 --- a/backend/SimRa-Visualization-API/pom.xml +++ b/backend/SimRa-Visualization-API/pom.xml @@ -121,7 +121,7 @@ junit junit - 4.11 + 4.13.1 test