[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.5-14-ge7f633c
X2Go dev team
git-admin at x2go.org
Sun May 19 13:03:19 CEST 2013
The branch, build-main has been updated
via e7f633c94f471c930d27d8fb95b523f701842e33 (commit)
from 65db3d550c384ff0afbc0d9e97855ac1bf4bbea7 (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:
etc/x2gobroker.conf | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
The diff of changes is:
diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf
index 3e9ee23..5d9a8d2 100644
--- a/etc/x2gobroker.conf
+++ b/etc/x2gobroker.conf
@@ -114,17 +114,17 @@
# Of course, the SSH daemon has to be made aware of this. This can be configured
# in /etc/ssh/sshd_config like this:
#
-# --- /etc/ssh/sshd_config.no-x2go 2013-03-01 09:57:04.000000000 +0100
-# +++ /etc/ssh/sshd_config 2013-03-01 09:56:57.000000000 +0100
-# @@ -28,7 +28,7 @@
+# --- /etc/ssh/sshd_config.no-x2go 2013-03-01 09:57:04.000000000 +0100
+# +++ /etc/ssh/sshd_config 2013-03-01 09:56:57.000000000 +0100
+# @@ -28,7 +28,7 @@
#
-# RSAAuthentication yes
-# PubkeyAuthentication yes
-# -AuthorizedKeysFile %h/.ssh/authorized_keys
-# +AuthorizedKeysFile %h/.ssh/authorized_keys %h/.x2go/authorized_keys
+# RSAAuthentication yes
+# PubkeyAuthentication yes
+# -AuthorizedKeysFile %h/.ssh/authorized_keys
+# +AuthorizedKeysFile %h/.ssh/authorized_keys %h/.x2go/authorized_keys
#
-# # Don't read the user's ~/.rhosts and ~/.shosts files
-# IgnoreRhosts yes
+# # Don't read the user's ~/.rhosts and ~/.shosts files
+# IgnoreRhosts yes
#
# This option can be overridden by the session profile parameter
# broker-authorized-keys=<file-location>
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