Skip to content
Snippets Groups Projects
Commit 52734a3e authored by efer's avatar efer
Browse files

local filter user can be different than dtu user

parent f343ade0
No related branches found
No related tags found
No related merge requests found
......@@ -244,7 +244,7 @@ if [ $? -ne 0 ]; then
ssh-keyscan -H -t ecdsa $TARGETNODE 2>/dev/null|grep ^[^#] >> ~/.ssh/known_hosts
fi
SSHKEY=~/.ssh/$SCRIPTNAME-$RUSER
SSHKEY=$H/.ssh/$SCRIPTNAME-$RUSER
if [ -f $SSHKEY ]; then
ssh -o BatchMode=yes -i $SSHKEY $RUSER@$TARGETNODE "grep -o $SCRIPTNAME-$RUSER@$HOST .ssh/authorized_keys" &>/dev/null
if [ $? -ne 0 ]; then
......@@ -387,7 +387,7 @@ curl -s $FILTER|grep -q $SCRIPTNAME
if [ $? -eq 0 ]; then
# Check for default & user filter
if [ ! -f $CONF_DIR/filter.orig ]; then
curl -s $FILTER|sed s/user/$RUSER/g > $CONF_DIR/filter.orig
curl -s $FILTER|sed s/user/$USER/g > $CONF_DIR/filter.orig
if [ ! -f $CONF_DIR/filter ]; then
cp $CONF_DIR/filter.orig $CONF_DIR/filter
fi
......@@ -395,14 +395,14 @@ if [ $? -eq 0 ]; then
cp $CONF_DIR/filter.orig $CONF_DIR/filter
else
# Check for updated default filter
curl -s $FILTER|sed s/user/$RUSER/g|diff $CONF_DIR/filter.orig - &>/dev/null
curl -s $FILTER|sed s/user/$USER/g|diff $CONF_DIR/filter.orig - &>/dev/null
if [ $? -ne 0 ]; then
diff $CONF_DIR/filter $CONF_DIR/filter.orig &>/dev/null
if [ $? -ne 0 ]; then
curl -s $FILTER|sed s/user/$RUSER/g > $CONF_DIR/filter.orig
curl -s $FILTER|sed s/user/$USER/g > $CONF_DIR/filter.orig
echo -e "[rclone filter]" $Y_"Updated filter.orig downloaded"$_N
else
curl -s $FILTER|sed s/user/$RUSER/g > $CONF_DIR/filter.orig
curl -s $FILTER|sed s/user/$USER/g > $CONF_DIR/filter.orig
cp $CONF_DIR/filter.orig $CONF_DIR/filter
fi
else
......@@ -520,7 +520,7 @@ curl -s \$FILTER|grep -q $SCRIPTNAME
if [ \$? -eq 0 ]; then
# Check for default & user filter
if [ ! -f \$CONF_DIR/filter.orig ]; then
curl -s \$FILTER|sed s/user/$RUSER/g > \$CONF_DIR/filter.orig
curl -s \$FILTER|sed s/user/$USER/g > \$CONF_DIR/filter.orig
if [ ! -f \$CONF_DIR/filter ]; then
cp \$CONF_DIR/filter.orig \$CONF_DIR/filter
fi
......@@ -528,14 +528,14 @@ if [ \$? -eq 0 ]; then
cp \$CONF_DIR/filter.orig \$CONF_DIR/filter
else
# Check for updated default filter
curl -s \$FILTER|sed s/user/$RUSER/g|diff \$CONF_DIR/filter.orig - &>/dev/null
curl -s \$FILTER|sed s/user/$USER/g|diff \$CONF_DIR/filter.orig - &>/dev/null
if [ \$? -ne 0 ]; then
diff \$CONF_DIR/filter \$CONF_DIR/filter.orig &>/dev/null
if [ \$? -ne 0 ]; then
curl -s \$FILTER|sed s/user/$RUSER/g > \$CONF_DIR/filter.orig
curl -s \$FILTER|sed s/user/$USER/g > \$CONF_DIR/filter.orig
echo "Updated filter.orig downloaded"
else
curl -s \$FILTER|sed s/user/$RUSER/g > \$CONF_DIR/filter.orig
curl -s \$FILTER|sed s/user/$USER/g > \$CONF_DIR/filter.orig
cp \$CONF_DIR/filter.orig \$CONF_DIR/filter
fi
fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment