From 47c3755c0abd0e4d2d7609c48e1e8cdc10ec41e5 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Thu, 1 Jun 2017 13:19:53 +0200
Subject: [PATCH] 
 library/roles/smartgears/smartgears_egi_image/templates/smartgears-setup.sh.j2:
 Fix a mistake in the function that sets the container.xml permissions. It
 screwed the home directory ones.

---
 .../templates/smartgears-setup.sh.j2               | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/smartgears/smartgears_egi_image/templates/smartgears-setup.sh.j2 b/smartgears/smartgears_egi_image/templates/smartgears-setup.sh.j2
index fe28134d..9e602f6a 100755
--- a/smartgears/smartgears_egi_image/templates/smartgears-setup.sh.j2
+++ b/smartgears/smartgears_egi_image/templates/smartgears-setup.sh.j2
@@ -177,19 +177,19 @@ function get_smartgears_scope_tokens() {
 }
 
 function fix_containerxml_perms() {
-    chown -R gcube:gcube 
+    chown -R gcube:gcube ${SM_DOT_CONF_D}
     chmod 640 ${SM_DOT_CONF_D}/.*
     chown gcube:gcube $SM_CONF_DEST_F
     chmod 640 $SM_CONF_DEST_F
 }
 
 
-function merge_container_xml() {
-    echo "-- merge_container_xml: compose the file" >> $LOG_FILE
-    cat $SM_CONF_F $SM_CONF_TOKENS_F $SM_CONF_TAIL_F > $SM_CONF_DEST_F
-    chown gcube:gcube $SM_CONF_DEST_F
-    chmod 640 $SM_CONF_DEST_F
-}
+# function merge_container_xml() {
+#     echo "-- merge_container_xml: compose the file" >> $LOG_FILE
+#     cat $SM_CONF_F $SM_CONF_TOKENS_F $SM_CONF_TAIL_F > $SM_CONF_DEST_F
+#     chown gcube:gcube $SM_CONF_DEST_F
+#     chmod 640 $SM_CONF_DEST_F
+# }
 
 function get_gcube_keys() {
     echo "-- get_gcube_keys" >> $LOG_FILE