This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository telekinesis. from b8ab258 x2go features: Add feature name X2GO_TELEKINESIS_TEKISFTPSERVER (for the Perl-based teki-sftpserver). new 1e47d33 fix tekidata-sftpserver launch The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .../lib/telekinesis/server/bin/tekidata-sftpserver | 6 +++++- .../post-start.d/000_telekinesis-server-startup | 2 +- .../pre-resume.d/000_telekinesis-server-resume | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository telekinesis. commit 1e47d33c1dcb2b11fa80abdb66f44286b9d5e96a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 1 14:01:31 2014 +0200 fix tekidata-sftpserver launch --- .../lib/telekinesis/server/bin/tekidata-sftpserver | 6 +++++- .../post-start.d/000_telekinesis-server-startup | 2 +- .../pre-resume.d/000_telekinesis-server-resume | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/lib/telekinesis/server/bin/tekidata-sftpserver b/server/lib/telekinesis/server/bin/tekidata-sftpserver index d404ef8..679c106 100755 --- a/server/lib/telekinesis/server/bin/tekidata-sftpserver +++ b/server/lib/telekinesis/server/bin/tekidata-sftpserver @@ -5,6 +5,10 @@ use warnings; use Net::SFTP::SftpServer ( { log => 'local5' }, qw ( :LOG :ACTIONS ) ); use BSD::Resource; # for setrlimit +use constant DEBUG_USER => { + SFTPTEST => 1, +} + # Security - make sure we have started this as sftp not ssh #unless ( scalar @ARGV == 3 and # $ARGV[1] eq '-c' and @@ -33,7 +37,7 @@ my $sftp = Net::SFTP::SftpServer->new( # on_file_sent => \&ActionOnSent, # on_file_received => \&ActionOnReceived, valid_filename_char => [ 'a' .. 'z', 'A' .. 'Z', '0' .. '9', '_', '.', '-' ], - follow_symlinks => + follow_symlinks => 1, deny => ALL, allow => [ ( SSH2_FXP_OPEN, diff --git a/server/lib/x2go/extensions/post-start.d/000_telekinesis-server-startup b/server/lib/x2go/extensions/post-start.d/000_telekinesis-server-startup index 0fe5dad..2891f7e 100755 --- a/server/lib/x2go/extensions/post-start.d/000_telekinesis-server-startup +++ b/server/lib/x2go/extensions/post-start.d/000_telekinesis-server-startup @@ -30,7 +30,7 @@ export DISPLAY=:$(echo $X2GO_SESSIONINFO | cut -d "|" -f3 | sed -e "s/[^0-9\-]// # launch Telekinesis server (if supported) if [ -n "$TEKICTRL_PORT" ] && [ "x$TEKICTRL_PORT" != "x-1" ]; then - (socat -W "$TEKIDATA_LOCK" TCP4-LISTEN:${TEKIDATA_PORT},reuseaddr,bind=127.0.0.1 EXEC:"/usr/lib/telekinesis/server/bin/tekidata-sftpserver";)& + (socat -W "$TEKIDATA_LOCK" TCP4-LISTEN:${TEKIDATA_PORT},reuseaddr,bind=127.0.0.1 EXEC:"/usr/lib/telekinesis/server/bin/tekidata-sftpserver $X2GO_SESSION";)& (telekinesis-server -setDEBUG=1 -setBINDTOPORT=${TEKICTRL_PORT} > ~/.x2go/C-${X2GO_SESSION}/telekinesis-server.log;)& (sleep 20; ss -nl | egrep "^LISTEN.*127.0.0.1:$TEKIDATA_PORT.*" 1>/dev/null && kill -9 $(cat "$TEKIDATA_LOCK" | sed -e 's/[^0-9]*//g'); )& fi diff --git a/server/lib/x2go/extensions/pre-resume.d/000_telekinesis-server-resume b/server/lib/x2go/extensions/pre-resume.d/000_telekinesis-server-resume index 63b1475..9e0241c 100755 --- a/server/lib/x2go/extensions/pre-resume.d/000_telekinesis-server-resume +++ b/server/lib/x2go/extensions/pre-resume.d/000_telekinesis-server-resume @@ -28,7 +28,7 @@ TEKIDATA_LOCK="$HOME/.x2go/C-${X2GO_SESSION}/telekinesis-sftp.pid" # if Telekinesis server is in use for this session, try to resume it if [ -n "$TEKICTRL_PORT" ] && [ "x$TEKICTRL_PORT" != "x-1" ]; then - (socat -W "$TEKIDATA_LOCK" TCP4-LISTEN:${TEKIDATA_PORT},reuseaddr,bind=127.0.0.1 EXEC:"lib/telekinesis/server/bin/tekidata-sftpserver";)& + (socat -W "$TEKIDATA_LOCK" TCP4-LISTEN:${TEKIDATA_PORT},reuseaddr,bind=127.0.0.1 EXEC:"lib/telekinesis/server/bin/tekidata-sftpserver $X2GO_SESSION";)& tekicmd -setSESSIONRESUME=1 -setX2GOSID=${X2GO_SESSION} (sleep 20; ss -nl | egrep "^LISTEN.*127.0.0.1:$TEKIDATA_PORT.*" 1>/dev/null && kill -9 $(cat "$TEKIDATA_LOCK" | sed -e 's/[^0-9]*//g'); )& fi -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git
-
git-admin＠x2go.org