From 4c8f892d03676bb7dbe15f20ca1022e871b6242e Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 9 May 2012 16:02:16 +0200
Subject: [PATCH] Add tmpdir configuration parameter to servers

---
 src/cloud/ec2/bin/econe-server        | 4 ++--
 src/cloud/ec2/etc/econe.conf          | 3 +++
 src/cloud/occi/bin/occi-server        | 6 +++---
 src/cloud/occi/etc/occi-server.conf   | 3 +++
 src/sunstone/bin/sunstone-server      | 3 +++
 src/sunstone/etc/sunstone-server.conf | 3 +++
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/cloud/ec2/bin/econe-server b/src/cloud/ec2/bin/econe-server
index 1327de4ed1..e8f35d4dbd 100755
--- a/src/cloud/ec2/bin/econe-server
+++ b/src/cloud/ec2/bin/econe-server
@@ -34,8 +34,8 @@ fi
 
 setup()
 {
-    eval `grep ^IMAGE_DIR= $ECONE_ETC`
-    export TMPDIR=$IMAGE_DIR/tmp
+    TMPDIR=$(grep ^:tmpdir: $ECONE_ETC|awk '{print $2}')
+    test -n $TMDIR && export TMPDIR
     mkdir -p $TMPDIR
 
 	if [ -f $ECONE_LOCK_FILE ]; then
diff --git a/src/cloud/ec2/etc/econe.conf b/src/cloud/ec2/etc/econe.conf
index 35de897481..59001e6c6e 100644
--- a/src/cloud/ec2/etc/econe.conf
+++ b/src/cloud/ec2/etc/econe.conf
@@ -18,6 +18,9 @@
 # Server Configuration
 #############################################################
 
+# Directory to store temp files when uploading images
+:tmpdir: /var/tmp/one
+
 # OpenNebula sever contact information
 :one_xmlrpc: http://localhost:2633/RPC2
 
diff --git a/src/cloud/occi/bin/occi-server b/src/cloud/occi/bin/occi-server
index 72625a1d61..9115b3d4bb 100755
--- a/src/cloud/occi/bin/occi-server
+++ b/src/cloud/occi/bin/occi-server
@@ -34,9 +34,9 @@ fi
 
 setup()
 {
-    eval `grep ^IMAGE_DIR= $OCCI_ETC `
-    export TMPDIR=$IMAGE_DIR/tmp
-    mkdir -p $TMPDIR
+  TMPDIR=$(grep ^:tmpdir: $OCCI_ETC|awk '{print $2}')
+  test -n $TMDIR && export TMPDIR
+  mkdir -p $TMPDIR
 
   if [ -f $OCCI_LOCK_FILE ]; then
     if [ -f  $OCCI_PID ]; then
diff --git a/src/cloud/occi/etc/occi-server.conf b/src/cloud/occi/etc/occi-server.conf
index f041e6d83e..09a6c446d8 100644
--- a/src/cloud/occi/etc/occi-server.conf
+++ b/src/cloud/occi/etc/occi-server.conf
@@ -18,6 +18,9 @@
 # Server configuration
 #############################################################
 
+# Directory to store temp files when uploading images
+:tmpdir: /var/tmp/one
+
 # OpenNebula sever contact information
 :one_xmlrpc: http://localhost:2633/RPC2
 
diff --git a/src/sunstone/bin/sunstone-server b/src/sunstone/bin/sunstone-server
index e9b3b0e1ad..fb0a435fed 100755
--- a/src/sunstone/bin/sunstone-server
+++ b/src/sunstone/bin/sunstone-server
@@ -35,6 +35,9 @@ fi
 
 setup()
 {
+  TMPDIR=$(grep ^:tmpdir: $SUNSTONE_CONF|awk '{print $2}')
+  test -n $TMDIR && export TMPDIR
+  mkdir -p $TMPDIR
 
   if [ -f $SUNSTONE_LOCK_FILE ]; then
     if [ -f  $SUNSTONE_PID ]; then
diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf
index 64915b50c0..54b4becb33 100644
--- a/src/sunstone/etc/sunstone-server.conf
+++ b/src/sunstone/etc/sunstone-server.conf
@@ -18,6 +18,9 @@
 # Server Configuration
 #############################################################
 
+# Directory to store temp files when uploading images
+:tmpdir: /var/tmp/one
+
 # OpenNebula sever contact information
 :one_xmlrpc: http://localhost:2633/RPC2