The branch, release/4.0.1.x has been updated via 13bdacd0f6da59323af0954b5df0359eddb82b8f (commit) from 4d8b6236a500e8aa53ba8e02dab42a91a2290c8e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 13bdacd0f6da59323af0954b5df0359eddb82b8f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Dec 28 23:20:46 2013 +0100 Provide man page for x2goserver.conf. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/Makefile | 3 ++ x2goserver/man/man5/x2goserver.conf.5 | 73 +++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 x2goserver/man/man5/x2goserver.conf.5 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 35d97fa..4c41675 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low - Provide RHEL/Fedora support in x2goserver-xsession. - Only sanity check for existence of /etc/x2go/Xsession.d on Debian (derived) systems. + - Provide man page for x2goserver.conf. * x2goserver.spec: + Ship x2goserver.spec (RPM package definitions) in upstream project. (Thanks to the Fedora package maintainers). File differs from the Fedora diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 828ce1a..96988d6 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -89,6 +89,9 @@ install_config: install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5 + $(INSTALL_FILE) man/man5/*.5 $(DESTDIR)$(MANDIR)/man5 + gzip -f $(DESTDIR)$(MANDIR)/man5/x2go*.5 $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 diff --git a/x2goserver/man/man5/x2goserver.conf.5 b/x2goserver/man/man5/x2goserver.conf.5 new file mode 100644 index 0000000..3b77280 --- /dev/null +++ b/x2goserver/man/man5/x2goserver.conf.5 @@ -0,0 +1,73 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goserver.conf 5 "Jan 2013" "Version 4.1.x.y" "X2Go Server Configuration" +.SH NAME +x2goserver.conf \- X2Go Server Main Configuration File +.SH SYNOPSIS +'nh +.fi +.ad 1 +x2goserver.conf + +.SH DESCRIPTION +\fBx2goserver.conf\fR is the main configuration file for X2Go Server and the \fBX2Go::Server\fR Perl API. +.SH SECTIONS +The \fBx2goserver.conf\fR's configuration file format is an INI-based configuration format. It falls +apart into sections and options with their values. + + [section1] + sec1option1 = valueA + sec1option2 = valueB + ... + + [section2] + sec2option1 = valueC + sec2option2 = valueD + ... + +.SH SECTION [limit users] +In this section you can list up Posix users known to the system and specify the max. number of allowed +simultaneous X2Go sessions in an X2Go Server farm. +.PP +.SH SECTION [limit groups] +In this section you can list up Posix group names known to the system and specify the max. number of allowed +simultaneous X2Go sessions in an X2Go Server farm. The session limitation applies to all users in the specified +groups. +.PP +If individual users are listed in section \fI[limit users]\fR and some of their groups are listed in +section \fI[limit groups]\fR, then the maximum value of allowed sessions will be chosen. +.PP +If a user is a member of several of the specified groups under section \fI[limit groups]\fR, then the number +of allowed simultaneous X2Go sessions for a certain user will be derived from the group with the +most allowed sessions found under this section. +.PP +.SH SECTION [log] +The \fI[log]\fR's section only option is the \fIloglevel\fR option. Allowed values are: +.TP 5 + emerg, alert, crit, err, warning, notice, info, debug. +.PP +The \fIloglevel\fR option controls the verbosity of the X2Go::Server Perl functions. The log output +appears via LOCAL7 (normally: /var/log/syslog). +.PP +.SH EXAMPLE +The below configuration file is the default after installation of X2Go Server: + + [limit users] + #user-foo=1 + + [limit groups] + #bar-group=1 + + [log] + # possible levels are: + # emerg, alert, crit, err, warning, notice, info, debug + loglevel=notice + +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).