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

[X2Go dev team]

The branch, master has been updated
       via  13ab1b0208c6eecdeffd10644aef35852a95271d (commit)
       via  1c8d13b888b1b8702fb16e75e80bd0fc7ed5ab80 (commit)
      from  b69d5fcb689bd60b49d0cd76cdaec96a4b22742e (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 13ab1b0208c6eecdeffd10644aef35852a95271d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 6 01:45:55 2012 +0100

    whitespace fix

commit 1c8d13b888b1b8702fb16e75e80bd0fc7ed5ab80
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 6 01:45:23 2012 +0100

    drop concept of a session profile / user map in separate file

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

Summary of changes:
 etc/x2gobroker.conf            |    1 -
 x2gobroker/backends/inifile.py |    2 +-
 x2gobroker/defaults.py         |    1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

The diff of changes is:
diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf
index 6d42375..78abacc 100644
--- a/etc/x2gobroker.conf
+++ b/etc/x2gobroker.conf
@@ -91,7 +91,6 @@ desktop-shell = KDE
 enable = false
 auth-mech = pam
 session-profiles = /etc/x2go/broker/x2gobroker-sessionprofiles.conf
-session-profiles-map = /etc/x2go/broker/x2gobroker-sessionprofilesmap.conf
 
 [ldap]
 enable = false
diff --git a/x2gobroker/backends/inifile.py b/x2gobroker/backends/inifile.py
index b9a575f..247234f 100644
--- a/x2gobroker/backends/inifile.py
+++ b/x2gobroker/backends/inifile.py
@@ -95,4 +95,4 @@ class X2GoBroker(base.X2GoBroker):
         selectprofile_output = {
             'server': 'localhost:22',
         }
-        return selectprofile_output
\ No newline at end of file
+        return selectprofile_output
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 2523166..25b3e6f 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -62,7 +62,6 @@ X2GOBROKER_CONFIG_DEFAULTS = {
         'enable': False,
         'auth-mech': 'pam',
         'session-profiles': '/etc/x2go/broker/x2gobroker-sessionprofiles.conf',
-        'session-profiles-map': '/etc/x2go/broker/x2gobroker-sessionprofilesmap.conf',
     },
     'ldap': {
         'enable': False,


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