[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.1-70-gcf5a514

X2Go dev team git-admin at x2go.org
Thu Feb 21 19:45:30 CET 2013


The branch, master has been updated
       via  cf5a5148589e8ab8832b3fde9521a3f838200120 (commit)
       via  8fcdf930eddf2dd32a665ff5736f15935920d9aa (commit)
      from  8030518e4bab147e1f7b03feae7c63eff1f1f17c (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 cf5a5148589e8ab8832b3fde9521a3f838200120
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 21 19:48:32 2013 +0100

    rewrite changelog

commit 8fcdf930eddf2dd32a665ff5736f15935920d9aa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 21 19:48:22 2013 +0100

    add man pages for all executables found in /usr/sbin

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                       |   23 ++++++++------
 debian/x2gobroker-agent.manpages       |    1 +
 debian/x2gobroker-authservice.manpages |    2 +-
 debian/x2gobroker.manpages             |    3 +-
 man/man8/x2gobroker-authservice.8      |   53 ++++++++++++++++++++++++++++++++
 man/man8/x2gobroker-keygen.8           |   48 +++++++++++++++++++++++++++++
 man/man8/x2gobroker-pubkeyauthorizer.8 |   45 +++++++++++++++++++++++++++
 man/man8/x2gobroker.8                  |    2 ++
 8 files changed, 165 insertions(+), 12 deletions(-)
 create mode 100644 debian/x2gobroker-agent.manpages
 create mode 100644 man/man8/x2gobroker-authservice.8
 create mode 100644 man/man8/x2gobroker-keygen.8
 create mode 100644 man/man8/x2gobroker-pubkeyauthorizer.8

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 80c2bf8..d0afa47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,27 +2,30 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low
 
   * New upstream version (0.0.0.2):
     - Make CC, CFLAGS and LDFLAGS configurable through build system.
-    - Make host session option a list, not string.
+    - Make host session option a (Python) list, not unicode/string.
     - Add load balancing support.
-    - Add foundation for logging support.
-    - Add man page for x2gobroker executable.
+    - Add file logging support.
     - Add logrotate configuration for x2gobroker log files.
-    - Make the daemon user ID configurable through x2gobroker-daemon.default.
-    - Handle different situation for X2GOBROKER_DAEMON_USER. Make sure
-      the getpass.getuser() function sees the correct effective UID.
-    - Make sure the unprivileged daemon user (x2gobroker) has access to the
-      PID file directory.
+    - Make the daemon user and group ID configurable through
+      python-x2gobroker.default.
     - Set log level to CRITICAL if running unit tests.
     - Perform PAM authentication via an authentication service (the broker
       runs as non-privileged user, the authentication service as root).
-    - Add tool: x2gobroker-keygen. Generate pub/priv SSH keypair for the
-      system user x2gobroker.
     - To make SSH pubkey deployment easier, serve the broker's public SSH key(s)
       under this URL http(s)://<broker_hostname>:<port>/pubkeys/.
+    - Add tool: x2gobroker-keygen. Generate pub/priv SSH keypair for the
+      system user x2gobroker.
+    - Add tool: x2gobroker-pubkeyauthorizer. Retrive broker's public SSH
+      keys and install them (on X2Go Servers with x2gobroker-agent installed).
+    - Add man pages for all executables in /usr/sbin.
   * /debian/control:
     + Add bin:package x2gobroker-agent.
   * /debian/x2gobroker-daemon.init:
     + Handle stale PID file and already running daemon.
+    + Handle different situation for X2GOBROKER_DAEMON_USER. Make sure
+      the getpass.getuser() function sees the correct effective UID.
+    + Make sure the unprivileged daemon user (x2gobroker) has access to the
+      PID file directory.
   * postinst/postrm scripts:
     + The user x2gobroker is required by x2gobroker-agent and x2gobroker-daemon.
       So now both bin:packages provide that user account.
diff --git a/debian/x2gobroker-agent.manpages b/debian/x2gobroker-agent.manpages
new file mode 100644
index 0000000..747905f
--- /dev/null
+++ b/debian/x2gobroker-agent.manpages
@@ -0,0 +1 @@
+man/man8/x2gobroker-pubkeyauthorizer.8
\ No newline at end of file
diff --git a/debian/x2gobroker-authservice.manpages b/debian/x2gobroker-authservice.manpages
index f32e545..8b080d0 100644
--- a/debian/x2gobroker-authservice.manpages
+++ b/debian/x2gobroker-authservice.manpages
@@ -1 +1 @@
-#man/man8/x2gobroker-authservice.8
\ No newline at end of file
+man/man8/x2gobroker-authservice.8
\ No newline at end of file
diff --git a/debian/x2gobroker.manpages b/debian/x2gobroker.manpages
index b010d6d..569dc33 100644
--- a/debian/x2gobroker.manpages
+++ b/debian/x2gobroker.manpages
@@ -1 +1,2 @@
-man/man8/x2gobroker.8
\ No newline at end of file
+man/man8/x2gobroker.8
+man/man8/x2gobroker-keygen.8
diff --git a/man/man8/x2gobroker-authservice.8 b/man/man8/x2gobroker-authservice.8
new file mode 100644
index 0000000..59a3938
--- /dev/null
+++ b/man/man8/x2gobroker-authservice.8
@@ -0,0 +1,53 @@
+'\" -*- 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 x2gobroker-authservice 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker"
+.SH NAME
+x2gobroker-authservice \- PAM authentication service for X2Go Session Broker
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+\fBx2gobroker-authservice\fR \kx
+.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
+'in \n(.iu+\nxu
+[
+\fIoptions\fR
+]
+'in \n(.iu-\nxu
+.ad b
+'hy
+.SH DESCRIPTION
+\fBx2gobroker-authservice\fR is a PAM authentication service for X2Go Session Broker. Whereas
+the X2Go Session Broker runs as a non-privileged user (standalone daemon mode) or as the
+also non-privileged httpd server's system user (WSGI mode), an authentication against PAM
+requires root privileges in most cases (esp. for pam_unix.so).
+.PP
+Thus, the PAM authentication has been moved into a separate service. The communication
+between X2Go Session Broker and PAM Authentication Service is handled through a
+unix domain socket file ($RUNDIR/x2gobroker/x2gobroker-authservice.socket).
+.PP
+This command is normally started through an init script.
+.SH COMMON OPTIONS
+\fBx2gobroker-authservice\fR accepts the following common options:
+.TP
+\*(T<\fB\-h, \-\-help\fR\*(T>
+Display a help with all available command line options and exit.
+.TP
+\*(T<\fB\-s <AUTHSOCKET>, \-\-socket <AUTHSOCKET>\fR\*(T>
+File name of the unix domain socket file used for communication between broker and authentication service.
+\*(T<\fB\-o <OWNER>, \-\-owner <OWNER>\fR\*(T>
+User ownership of the \fI<AUTHSOCKET>\fR file.
+\*(T<\fB\-g <GROUP>, \-\-group <GROUP>\fR\*(T>
+Group ownership of the \fI<AUTHSOCKET>\fR file.
+\*(T<\fB\-p <PERMISSIONS>, \-\-permissions <PERMISSIONS>\fR\*(T>
+Set these file permissions for the \fI<AUTHSOCKET>\fR file. Use numerical permissions (e.g. 0640).
+.SH "FILES"
+$RUNDIR/x2gobroker/x2gobroker-authservice.socket
+.SH AUTHOR
+This manual has been written for the X2Go project by
+Mike Gabriel <mike.gabriel at das-netzwerkteam.de>.
diff --git a/man/man8/x2gobroker-keygen.8 b/man/man8/x2gobroker-keygen.8
new file mode 100644
index 0000000..b17b5d2
--- /dev/null
+++ b/man/man8/x2gobroker-keygen.8
@@ -0,0 +1,48 @@
+'\" -*- 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 x2gobroker-keygen 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker"
+.SH NAME
+x2gobroker-keygen \- Generate SSH keys for X2Go Session Broker
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+\fBx2gobroker-keygen\fR \kx
+.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
+'in \n(.iu+\nxu
+[
+\fIoptions\fR
+]
+'in \n(.iu-\nxu
+.ad b
+'hy
+.SH DESCRIPTION
+\fBx2gobroker-keygen\fR generates a SSH pub/priv key pair and makes it usable through
+X2Go Session Broker.
+.PP
+This command has to be execute once per broker installation and requires root privileges.
+.SH COMMON OPTIONS
+\fBx2gobroker-keygen\fR accepts the following common options:
+.TP
+\*(T<\fB\-h, \-\-help\fR\*(T>
+Display a help with all available command line options and exit.
+.TP
+.TP
+\*(T<\fB\-t {RSA,DSA}, \-\-key_type {RSA,DSA}\fR\*(T>
+SSH pub/priv key type (allowed values: RSA, DSA).
+.TP
+\*(T<\fB\-f, \-\-force\fR\*(T>
+Re-generate SSH pub/priv key pair and enforce overwriting of existing key pair files.
+
+WARNING: you will loose previously create key files when this option is used.
+.SH "FILES"
+~x2gobroker/.ssh/*
+.PP
+.SH AUTHOR
+This manual has been written for the X2Go project by
+Mike Gabriel <mike.gabriel at das-netzwerkteam.de>.
diff --git a/man/man8/x2gobroker-pubkeyauthorizer.8 b/man/man8/x2gobroker-pubkeyauthorizer.8
new file mode 100644
index 0000000..4602ce8
--- /dev/null
+++ b/man/man8/x2gobroker-pubkeyauthorizer.8
@@ -0,0 +1,45 @@
+'\" -*- 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 x2gobroker-pubkeyauthorizer 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker"
+.SH NAME
+x2gobroker-pubkeyauthorizer \- Retrieve public SSH keys from an X2Go Session Broker
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+\fBx2gobroker-pubkeyauthorizer\fR \kx
+.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
+'in \n(.iu+\nxu
+[
+\fIoptions\fR
+]
+'in \n(.iu-\nxu
+.ad b
+'hy
+.SH DESCRIPTION
+\fBx2gobroker-pubkeyauthorizer\fR retrieves the X2Go Session Broker's public SSH key(s) and
+adds it to ~x2gobroker/.ssh/authorized_keys.
+.PP
+This command has to be executed once on each X2Go Server that is to become a member of a muli-node
+X2Go server farm. The execution of this command requires root-privileges.
+.PP
+.SH COMMON OPTIONS
+\fBx2gobroker-pubkeyauthorizer\fR accepts the following common options:
+.TP
+\*(T<\fB\-h, \-\-help\fR\*(T>
+Display a help with all available command line options and exit.
+.TP
+\*(T<\fB\-b <BROKER_URL>, \-\-broker-url <BROKER_URL>\fR\*(T>
+The URL of the X2Go Session Broker that we want to retrieve public keys from.
+The common pattern for this URL is http(s)://<broker_hostname>:<port>/pubkeys/, but may differ
+depending on your X2Go Session Broker setup.
+.SH "FILES"
+~x2gobroker/.ssh/authorized_keys
+.SH AUTHOR
+This manual has been written for the X2Go project by
+Mike Gabriel <mike.gabriel at das-netzwerkteam.de>.
diff --git a/man/man8/x2gobroker.8 b/man/man8/x2gobroker.8
index 6782fda..8811c2b 100644
--- a/man/man8/x2gobroker.8
+++ b/man/man8/x2gobroker.8
@@ -24,6 +24,8 @@ x2gobroker \- Session Broker for X2Go
 .SH DESCRIPTION
 \fBx2gobroker\fR is a Web.py based implementation of the X2Go Session Broker API.
 .PP
+This command is normally executed either through an init script or via the WSGI module in your httpd server.
+.PP
 See the included README and TODO for further information on \fBx2gobroker\fR.
 .SH COMMON OPTIONS
 \fBx2gobroker\fR accepts the following common options:


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list