This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 3e0578eecfb4ce0cdba73ce483eb57618ca6095f Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 21 13:16:30 2016 +0200 x2goserver/sbin/x2gocleansessions: move in-file POD to end of file, rather than "commenting" out all the remaining code. Fixes: #1068. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 + x2goserver/sbin/x2gocleansessions | 95 +++++++++++++++++++------------------ 2 files changed, 50 insertions(+), 47 deletions(-) diff --git a/debian/changelog b/debian/changelog index c33fe81..14e48ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -325,6 +325,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low appending new data. Fixes: #923. - x2goserver-xsession/etc/Xsession: fix wrong variable usage. Fixes: #1073. + - x2goserver/sbin/x2gocleansessions: move in-file POD to end of file, + rather than "commenting" out all the remaining code. Fixes: #1068. * x2goserver.spec: - Add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. Logcheck is not diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 03f899b..a56ccc1 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -47,53 +47,6 @@ GetOptions('debug|d' => \$debug, 'help|?|h' => \$help, 'man' => \$man) or pod2us pod2usage(1) if $help; pod2usage(-verbose => 2, -exitval => 0) if $man; -__END__ -=head1 NAME - -x2gocleansessions - X2Go Server Cleanup Daemon - -=head1 SYNOPSIS - -x2gocleansessions [options] - - Options: - --help|-h|-? brief help message - --man full documentation - --debug enable debugging and don't daemonize - -=head1 OPTIONS - -=over 8 - -=item B<--help>|B<-?>|B<-h> - -Print a brief help message and exits. - -=item B<--man> - -Prints the manual page and exits. - -=item B<--debug>|B<-d> - -Override debugging setting in global config and keep application in foreground -instead of daemonizing. - -=back - -=head1 DESCRIPTION - -B<x2gocleansessions> is run as a service on X2Go servers to handle the cleanup -of stale sessions. - -B<x2gocleansessions> must be run (as a service) with root privileges. - -=head1 AUTHOR - -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -for the X2Go project (http://www.x2go.org). - -=cut - openlog($0,'cons,pid','user'); if ($debug) { @@ -396,3 +349,51 @@ elsif ($pid == 0 ) } } + +__END__ +=head1 NAME + +x2gocleansessions - X2Go Server Cleanup Daemon + +=head1 SYNOPSIS + +x2gocleansessions [options] + + Options: + --help|-h|-? brief help message + --man full documentation + --debug enable debugging and don't daemonize + +=head1 OPTIONS + +=over 8 + +=item B<--help>|B<-?>|B<-h> + +Print a brief help message and exits. + +=item B<--man> + +Prints the manual page and exits. + +=item B<--debug>|B<-d> + +Override debugging setting in global config and keep application in foreground +instead of daemonizing. + +=back + +=head1 DESCRIPTION + +B<x2gocleansessions> is run as a service on X2Go servers to handle the cleanup +of stale sessions. + +B<x2gocleansessions> must be run (as a service) with root privileges. + +=head1 AUTHOR + +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +for the X2Go project (http://www.x2go.org). + +=cut + -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git