[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-28-g50413fd

X2Go dev team git-admin at x2go.org
Wed Sep 25 11:16:38 CEST 2013


The branch, master has been updated
       via  50413fda70a8ec4b0663f87b1e14c5c39bb8efdf (commit)
      from  39b88526208c985c15e53703372223ebe09e6ff1 (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 50413fda70a8ec4b0663f87b1e14c5c39bb8efdf
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 25 11:09:16 2013 +0200

    Modify default x2gobroker-sessionprofiles.conf and provide something that will works with every default setup.

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

Summary of changes:
 debian/changelog                           |    2 +
 etc/broker/x2gobroker-sessionprofiles.conf |   84 ++++++++++++++++------------
 2 files changed, 50 insertions(+), 36 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 37e0d60..55644d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low
     - Provide empty directory /etc/x2go/broker/ssl.
     - Re-order x2gobroker main file. Move logging further to the back to
       allow taking command-line options into account.
+    - Modify default x2gobroker-sessionprofiles.conf and provide something
+      that will works with every default setup.
   * /debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
   * /debian/x2gobroker-agent.dirs:
diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf
index c45060d..a2faac9 100644
--- a/etc/broker/x2gobroker-sessionprofiles.conf
+++ b/etc/broker/x2gobroker-sessionprofiles.conf
@@ -62,6 +62,18 @@ setdpi=0
 pack=16m-jpeg
 directrdp=false
 
+[localhost-kde]
+name=KDE - localhost
+user=
+hostname=localhost
+command=KDE
+
+[localhost-mate]
+name=MATE - localhost
+user=
+hostname=localhost
+command=MATE
+
 ### EXAMPLES: Below you find some config examples. Adapt them to your needs or
 ### simply write your own session profiles and remove the examples below.
 
@@ -84,42 +96,42 @@ directrdp=false
 ## session profiles will be shown in X2Go Client.
 ##
 
-[pool-A-server-A]
-user=
-host=server-a.pool-a.domain.local
-name=GNOME - pool-A (srv-A)
-command=GNOME
-rootless=false
-acl-groups-allow=gnome-users,admins
-acl-groups-deny=ALL
-acl-clients-deny=ALL
-acl-clients-allow=10.1.0.0/16
-acl-any-order=deny-allow
-broker-session-autologin=true
-
-[pool-A-server-B]
-user=
-host=server-b.pool-a.domain.local
-name=GNOME - pool-A (srv-B)
-command=GNOME
-rootless=false
-acl-groups-allow=gnome-users,admins
-acl-groups-deny=ALL
-acl-clients-deny=ALL
-acl-clients-allow=10.2.0.0/16
-acl-any-order=deny-allow
-broker-session-autologin=true
-
-[pool-A-server-C]
-user=
-host=server-c.pool-a.domain.local
-name=KDE - pool-A (srv-C)
-command=KDE
-rootless=false
-acl-groups-allow=kde-users,admins
-acl-groups-deny=ALL
-acl-any-order=deny-allow
-broker-session-autologin=true
+#[pool-A-server-A]
+#user=
+#host=server-a.pool-a.domain.local
+#name=GNOME - pool-A (srv-A)
+#command=GNOME
+#rootless=false
+#acl-groups-allow=gnome-users,admins
+#acl-groups-deny=ALL
+#acl-clients-deny=ALL
+#acl-clients-allow=10.1.0.0/16
+#acl-any-order=deny-allow
+#broker-session-autologin=true
+
+#[pool-A-server-B]
+#user=
+#host=server-b.pool-a.domain.local
+#name=GNOME - pool-A (srv-B)
+#command=GNOME
+#rootless=false
+#acl-groups-allow=gnome-users,admins
+#acl-groups-deny=ALL
+#acl-clients-deny=ALL
+#acl-clients-allow=10.2.0.0/16
+#acl-any-order=deny-allow
+#broker-session-autologin=true
+
+#[pool-A-server-C]
+#user=
+#host=server-c.pool-a.domain.local
+#name=KDE - pool-A (srv-C)
+#command=KDE
+#rootless=false
+#acl-groups-allow=kde-users,admins
+#acl-groups-deny=ALL
+#acl-any-order=deny-allow
+#broker-session-autologin=true
 
 ##
 ## EXAMPLE: pool-B (e.g. webserver in the DMZ or on the internet)


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