From d03af70a84e6126e6964ee527fd857f22a146fb6 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Wed, 25 Jan 2017 13:47:20 +0000
Subject: [PATCH] updated init scripts for daq services
---
etc/init.d/dm-mongo-express | 2 +-
etc/init.d/dm-mongodb | 2 +-
setup.sh | 2 +-
src/python/dm/__init__.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/etc/init.d/dm-mongo-express b/etc/init.d/dm-mongo-express
index 8482eec4..87dcc927 100755
--- a/etc/init.d/dm-mongo-express
+++ b/etc/init.d/dm-mongo-express
@@ -44,7 +44,7 @@ mkdir -p ${DM_INSTALL_DIR}/var/log
DM_MONGODB_HOST=${DM_MONGODB_HOST:=127.0.0.1}
DM_MONGODB_PORT=${DM_MONGODB_PORT:=27017}
-DM_NODE_DIR=${DM_SUPPORT_DIR}/node/${DM_HOST_ARCH}
+DM_NODE_DIR=${DM_OPT_DIR}/node
DM_FOREVER_DIR=${DM_NODE_DIR}/bin/node_modules/forever
DM_MONGO_EXPRESS_DIR=${DM_NODE_DIR}/bin/node_modules/mongo-express
diff --git a/etc/init.d/dm-mongodb b/etc/init.d/dm-mongodb
index 70aea02a..78f00a75 100755
--- a/etc/init.d/dm-mongodb
+++ b/etc/init.d/dm-mongodb
@@ -44,7 +44,7 @@ mkdir -p ${DM_INSTALL_DIR}/var/log
DM_MONGODB_HOST=${DM_MONGODB_HOST:=127.0.0.1}
DM_MONGODB_PORT=${DM_MONGODB_PORT:=27017}
-DM_MONGODB_DIR=${DM_SUPPORT_DIR}/mongodb/${DM_HOST_ARCH}
+DM_MONGODB_DIR=${DM_OPT_DIR}/mongodb/${DM_HOST_ARCH}
DM_MONGODB_DATA_DIR=${DM_MONGODB_DIR}/data
mkdir -p ${DM_MONGODB_DATA_DIR}
diff --git a/setup.sh b/setup.sh
index 9600567a..786fab9f 100644
--- a/setup.sh
+++ b/setup.sh
@@ -54,7 +54,7 @@ prependPathIfDirExists() {
}
# Setup path and other variables
-prependPathIfDirExists $DM_OPT_DIR/node/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_OPT_DIR/node/bin
prependPathIfDirExists $DM_OPT_DIR/mongodb/$DM_HOST_ARCH/bin
prependPathIfDirExists $DM_OPT_DIR/postgresql/$DM_HOST_ARCH/bin
prependPathIfDirExists $DM_OPT_DIR/java/$DM_HOST_ARCH/bin
diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py
index ccd277af..817b1362 100644
--- a/src/python/dm/__init__.py
+++ b/src/python/dm/__init__.py
@@ -1 +1 @@
-__version__ = "1.0 (2017.01.23)"
+__version__ = "1.0 (2017.01.24)"
--
GitLab