UPDATE: issue #40, REP_LOCATION path

h2020-westlife-eu · Mar 27, 2018 · 2a7667b · 2a7667b
1 parent 72dc70d
commit 2a7667b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/backend/src/main/java/org/cirmmp/spring/controller/DatasetServiceCon.java b/backend/src/main/java/org/cirmmp/spring/controller/DatasetServiceCon.java
@@ -32,10 +32,10 @@
 public class DatasetServiceCon extends SharedCon {
     private static final Logger LOG = LoggerFactory.getLogger(RestCon.class);
     //REP_USER_DIR environment variable sets directory where new dataset may resist
-    private static final String REP_LOCATION=Optional.ofNullable(System.getenv("REP_LOCATION")).orElse("/home/vagrant/wp6_repository/frontend");
+    private static final String REP_LOCATION=Optional.ofNullable(System.getenv("REP_LOCATION")).orElse("/home/vagrant/wp6_repository");
     private static final String USER_DIR=Optional.ofNullable(System.getenv("VF_STORAGE_DIR")).orElse("/home/vagrant/work/");
-    private static final String TEST_DIR=REP_LOCATION.substring(0,REP_LOCATION.lastIndexOf("/"))+"test";
-    private static final String SCRIPT_DIR=REP_LOCATION.substring(0,REP_LOCATION.lastIndexOf("/"))+"scripts";
+    private static final String TEST_DIR=REP_LOCATION.substring(0,REP_LOCATION.lastIndexOf("/"))+"test/";
+    private static final String SCRIPT_DIR=REP_LOCATION+"/scripts/";
     private static Gson gson = new Gson();
 
     @Autowired

diff --git a/bootstrap.sh b/bootstrap.sh
@@ -37,7 +37,7 @@ yum -y install php php-common
 cp -R $WP6REPSRC/conf-template/* /
 # replace path to frontend in configuration to current path
 export WP6SRCESC=$(echo $WP6REPSRC | sed 's_/_\\/_g')
-sed -i -e "s/\/cvmfs\/west-life.egi.eu\/software\/repository\/latest\/frontend/${WP6SRCESC}\/frontend/g" /etc/httpd/conf.d/wp6-repository.conf
+sed -i -e "s/\/cvmfs\/west-life.egi.eu\/software\/repository\/latest/${WP6SRCESC}/g" /etc/httpd/conf.d/wp6-repository.conf
 for file in $(ls /etc/httpd/conf.d/proxy* ); do sed -i -e "s/\/cvmfs\/west-life.egi.eu\/software\/repository\/latest/${WP6SRCESC}/g" "${file}";done
 #add +x permission on all html files which has include directive
 # some html pages includes header with menu, footer etc shared among pages

diff --git a/conf-template/etc/systemd/system/westlife-repository.service b/conf-template/etc/systemd/system/westlife-repository.service
@@ -4,7 +4,7 @@ Description=West-Life VirtualFolder MetadataService
 [Service]
 Type=simple
 EnvironmentFile=/etc/westlife/repository.key
-Environment=REP_LOCATION=/cvmfs/west-life.egi.eu/software/repository/latest/frontend
+Environment=REP_LOCATION=/cvmfs/west-life.egi.eu/software/repository/latest
 Environment=VF_STORAGE_DIR=/home/vagrant/work
 Environment=VF_ALLOW_FILESYSTEM=true
 Environment=VF_ALLOW_MODULES=true