[DRE-commits] [diaspora-installer] 06/13: read env variables

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch 04x-05x_update
in repository diaspora-installer.

commit 09c683a79f9359f35097b4a85940695195df2c20
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue May 19 18:53:07 2015 +0530

    read env variables
---
 debian/diaspora-common.init | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/diaspora-common.init b/debian/diaspora-common.init
index cab08fc..32b7555 100644
--- a/debian/diaspora-common.init
+++ b/debian/diaspora-common.init
@@ -12,12 +12,19 @@
 # Author: FABIAN Tamas Laszlo <giganetom at gmail.com>
 # Updated: Pirate Praveen <praveen at debian.org>
 
+# Read diaspora common variables
+. /etc/diaspora/diaspora-common.conf
+
+# Read diaspora environment variables
+. ${diaspora_conf}
+
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 # Note: /usr/local/bin for foreman gem
+
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
 DESC="Diaspora application server"
 NAME=diaspora
-DIASPORA_HOME="/usr/share/diaspora"
+DIASPORA_HOME="${diaspora_home}"
 
 STARTSCRIPT="./script/server"
 
@@ -71,7 +78,6 @@ do_start()
         return 1
     fi
     
-    . /etc/diaspora.conf
     cd $DIASPORA_HOME
     sudo -u $USER -E -H $STARTSCRIPT >> $LOGFILE 2>&1  &
     if  [ $? -gt 0 ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git