The branch, build-baikal has been updated via cbebebc2e846bdc7d1f2a699708804c4829ddaad (commit) from e4229c2ccb033dda63c92b65f40570feb3da339b (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + debian/control | 19 +++++ debian/x2goserver-common.install | 2 + debian/x2goserver-common.manpages | 1 + debian/x2goserver.install | 2 +- {x2goserver-compat => x2goserver-common}/Makefile | 37 +++++----- .../VERSION.x2goserver-common | 0 .../etc/x2goserver.conf | 0 x2goserver-common/man/man5/x2goserver.conf.5 | 73 ++++++++++++++++++++ x2goserver/Makefile | 2 - 10 files changed, 117 insertions(+), 21 deletions(-) create mode 100644 debian/x2goserver-common.install create mode 100644 debian/x2goserver-common.manpages copy {x2goserver-compat => x2goserver-common}/Makefile (65%) copy x2goserver-compat/VERSION.x2goserver-compat => x2goserver-common/VERSION.x2goserver-common (100%) copy {x2goserver => x2goserver-common}/etc/x2goserver.conf (100%) create mode 100644 x2goserver-common/man/man5/x2goserver.conf.5 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0d91c6f..c4c24d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low + Package X2Go::Log in separate package: libx2go-log-perl. + Package X2Go::Server::DB in separate package: libx2go-server-db-perl. + x2goserver package: Depend on libx2go-log-perl, libx2go-server-db-perl. + + Move x2goserver.conf into separate package: x2goserver-common. Provide + man page for x2goserver.conf. [ Oleksandr Shneyder ] * New upstream version (3.2.0.0): diff --git a/debian/control b/debian/control index 1f47f49..a1a2530 100644 --- a/debian/control +++ b/debian/control @@ -13,12 +13,29 @@ Homepage: http://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary +Package: x2goserver-common +Architecture: any +Depends: + ${misc:Depends}, +Description: X2Go Server (common files) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This package contains files needed by the X2Go Server + and the X2Go::Server Perl API. + Package: libx2go-server-perl Architecture: any Section: perl Depends: ${perl:Depends}, ${misc:Depends}, + x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), Description: Perl X2Go::Server package X2Go is a server based computing environment with - session resuming @@ -38,6 +55,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libx2go-server-perl (>= ${source:Version}), libx2go-server-perl (<< ${source:Version}.1~), + x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), Description: Perl X2Go::Server:DB package X2Go is a server based computing environment with - session resuming @@ -55,6 +73,7 @@ Section: perl Depends: ${perl:Depends}, ${misc:Depends}, + x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), Description: Perl X2Go::Log package X2Go is a server based computing environment with - session resuming diff --git a/debian/x2goserver-common.install b/debian/x2goserver-common.install new file mode 100644 index 0000000..1bf6502 --- /dev/null +++ b/debian/x2goserver-common.install @@ -0,0 +1,2 @@ +x2goserver/etc/x2go* /etc/x2go/ +x2goserver/VERSION.x2goserver-common /usr/share/x2go/versions/ diff --git a/debian/x2goserver-common.manpages b/debian/x2goserver-common.manpages new file mode 100644 index 0000000..18d0d48 --- /dev/null +++ b/debian/x2goserver-common.manpages @@ -0,0 +1 @@ +x2goserver/man/man5/* \ No newline at end of file diff --git a/debian/x2goserver.install b/debian/x2goserver.install index d51c15d..259301f 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -1,6 +1,6 @@ x2goserver/bin/x2go* /usr/bin/ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/lib/x2go* /usr/lib/x2go/ -x2goserver/etc/x2go* /etc/x2go/ +x2goserver/etc/x2go_logout* /etc/x2go/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/share/x2gofeature.d /usr/share/x2go/ diff --git a/x2goserver-compat/Makefile b/x2goserver-common/Makefile similarity index 65% copy from x2goserver-compat/Makefile copy to x2goserver-common/Makefile index 3775dae..bb9df7d 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-common/Makefile @@ -20,8 +20,8 @@ MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) -#SBIN_SCRIPTS=$(shell cd sbin && echo *) -#LIB_FILES=$(shell cd lib && echo *) +SBIN_SCRIPTS=$(shell cd sbin && echo *) +LIB_FILES=$(shell cd lib && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` @@ -43,45 +43,46 @@ build_man2html: for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done -clean: clean_man2html +clean: clean-arch clean-indep + +clean-arch: + +clean-indep: clean_man2html clean_man2html: - rm -rf `dirname $(MAN2HTML_DEST)` + rm -Rf `dirname $(MAN2HTML_DEST)` install: install_scripts install_config install_man install_version install_scripts: - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) - $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ - $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) + $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ install_man: - $(INSTALL_DIR) $(DESTDIR)$(MANDIR) - $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 - $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 - gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5 + $(INSTALL_FILE) man/man5/*.5 $(DESTDIR)$(MANDIR)/man5 + gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.5 install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions - $(INSTALL_FILE) VERSION.x2goserver-compat $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat + $(INSTALL_FILE) VERSION.x2goserver-common $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-common uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: - for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done - for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: + $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf + $(RM_DIR) $(DESTDIR)$(ETCDIR) || true uninstall_man: - for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done - for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done + for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man5/$$file.5.gz; done + for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man5/$$file.5.gz; done $(RM_DIR) $(DESTDIR)$(MANDIR) || true uninstall_version: - $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-compat + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-common $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-common/VERSION.x2goserver-common similarity index 100% copy from x2goserver-compat/VERSION.x2goserver-compat copy to x2goserver-common/VERSION.x2goserver-common diff --git a/x2goserver/etc/x2goserver.conf b/x2goserver-common/etc/x2goserver.conf similarity index 100% copy from x2goserver/etc/x2goserver.conf copy to x2goserver-common/etc/x2goserver.conf diff --git a/x2goserver-common/man/man5/x2goserver.conf.5 b/x2goserver-common/man/man5/x2goserver.conf.5 new file mode 100644 index 0000000..ecceb11 --- /dev/null +++ b/x2goserver-common/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 "Sep 2012" "Version 3.2.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). diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 1e6315d..53b54c9 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -66,7 +66,6 @@ install_scripts: install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) - $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2go_logout.d $(INSTALL_FILE) etc/x2go_logout $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/x2go_logout.d/* $(DESTDIR)$(ETCDIR)/x2go_logout.d/ @@ -94,7 +93,6 @@ uninstall_scripts: $(RM_DIR) $(DESTDIR)$(SHAREDIR) || true uninstall_config: - $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2go_logout.d/* $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2go_logout $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2go_logout.d || true 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).