deployment works now

2 files changed, 6 insertions, 2 deletions

diff --git a/src/deploy.sh b/src/deploy.sh
index 9b24a4a..23400b2 100755
--- a/src/deploy.sh
+++ b/src/deploy.sh
@@ -50,7 +50,7 @@ for machine in *; do
     echo "copying files to $machine ... "
     tar -czf "$machine.tar.gz" "$machine"/*
     scp -i "$SSH_KEY" -F "$SSH_CONFIG" "$machine.tar.gz" $SSH_USER@"$machine":/tmp
-    ssh -i "$SSH_KEY" -F "$SSH_CONFIG" $SSH_USER@"$machine" install "$machine.tar.gz"
+    ssh -i "$SSH_KEY" -F "$SSH_CONFIG" $SSH_USER@"$machine" install "/tmp/$machine.tar.gz"
     rm "$machine.tar.gz"
   fi
 done
diff --git a/src/flufigut-client.sh b/src/flufigut-client.sh
index 91591fd..b245d33 100755
--- a/src/flufigut-client.sh
+++ b/src/flufigut-client.sh
@@ -51,11 +51,12 @@ if [ "install" = "$1" ]; then
       exit 1
     fi
     adduser flufigut --disabled-password --home /var/lib/flufigut --gecos "flufigut management" --shell "/bin/sh"
+    adduser flufigut flumotion
     mkdir -p /var/lib/flufigut/.ssh
     echo 'command="/usr/local/bin/flufigut-client.sh",no-X11-forwarding,no-agent-forwarding,no-port-forwarding '$pubkey > /var/lib/flufigut/.ssh/authorized_keys
     chown -R flufigut:flufigut /var/lib/flufigut/.ssh
     chmod 600 /var/lib/flufigut/.ssh/authorized_keys
-    echo "flufigut ALL = (flumotion) NOPASSWD: $DAEMON" >> /etc/sudoers
+    echo "flufigut ALL = (flumotion) NOPASSWD: $DAEMON, /bin/tar" >> /etc/sudoers
   fi
   echo "successfully installed flufigut client."
 
@@ -82,6 +83,9 @@ param=`echo $SSH_ORIGINAL_COMMAND | awk '{ print $2 }'`
 case "$command" in
   install)
     echo -n "install files from $param ... "
+    cd $CONF_DIR
+    sudo -u flumotion tar --strip-components=1 -xzf "$param"
+    rm "$param"
     echo "done."
   ;;
   start)