[X2go-Commits] x2gobroker.git - master (branch) updated: e39d0f888c8dfb0c12a069808a24863e50e94af7

[X2Go dev team]

The branch, master has been updated
       via  e39d0f888c8dfb0c12a069808a24863e50e94af7 (commit)
      from  23dabd44c78fe66a0c4fbcc64c1212e98b0e76a1 (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 e39d0f888c8dfb0c12a069808a24863e50e94af7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jan 25 09:03:52 2013 +0100

    adapt ACLs in x2gobroker-sessionprofiles.conf to latest ACL concept changes

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

Summary of changes:
 etc/broker/x2gobroker-sessionprofiles.conf |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf
index c8982f3..05c582a 100644
--- a/etc/broker/x2gobroker-sessionprofiles.conf
+++ b/etc/broker/x2gobroker-sessionprofiles.conf
@@ -75,8 +75,8 @@ user=
 host=server-a.pool-a.domain.local
 name=GNOME - pool-A (srv-A)
 command=GNOME
-acl-users-deny=ALL
 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
@@ -86,8 +86,8 @@ user=
 host=server-b.pool-a.domain.local
 name=GNOME - pool-A (srv-B)
 command=GNOME
-acl-users-deny=ALL
 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
@@ -97,8 +97,8 @@ user=
 host=server-c.pool-a.domain.local
 name=KDE - pool-A (srv-C)
 command=KDE
-acl-users-deny=ALL
 acl-groups-allow=kde-users,admins
+acl-groups-deny=ALL
 acl-any-order=deny-allow
 
 ##
@@ -120,8 +120,8 @@ user=
 host=server-d.domain.internet
 name=LXDE - srv-D
 command=LXDE
-acl-users-deny=ALL
 acl-groups-allow=admins
+acl-groups-deny=ALL
 acl-clients-deny=ALL
 acl-clients-allow=admin-machine1.domain.local, admin-machine2.domain.local, admin-machine3.domain.local
 acl-any-order=deny-allow
@@ -146,7 +146,8 @@ user=
 host=s-E1.pool-c.domain.local,s-E2.pool-c.domain.local,s-E3.pool-c.domain.local,s-E4.pool-c.domain.local,s-E5.pool-c.domain.local,s-E6.pool-c.domain.local
 name=XFCE - pool-C
 command=XFCE
+acl-users-allow=testuser-A,testuser-B
 acl-users-deny=ALL
-acl-users-allow=test-A,test-B
 acl-groups-allow=students,admins
+acl-groups-deny=ALL
 acl-any-order=deny-allow


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).