[X2Go-Commits] x2gobroker.git - build-main (branch) updated: d4db450e2514f71b0fed5e465f77267a84ea1fe8
X2Go dev team
git-admin at x2go.org
Sun May 19 13:04:32 CEST 2013
The branch, build-main has been updated
via d4db450e2514f71b0fed5e465f77267a84ea1fe8 (commit)
from e2e578a2843c24fa7af5d41dc07d718b09105d55 (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:
.../x2gobroker-singlenodes-sessionprofiles.conf | 179 ++++++++++++++++++++
.../x2gobroker-singlenodes-sessionprofilesmap.conf | 17 ++
etc/x2gobroker.conf | 6 +-
x2gobroker/backends/{simple.py => singlenodes.py} | 3 +-
x2gobroker/defaults.py | 6 +-
5 files changed, 204 insertions(+), 7 deletions(-)
create mode 100644 etc/broker/x2gobroker-singlenodes-sessionprofiles.conf
create mode 100644 etc/broker/x2gobroker-singlenodes-sessionprofilesmap.conf
rename x2gobroker/backends/{simple.py => singlenodes.py} (88%)
The diff of changes is:
diff --git a/etc/broker/x2gobroker-singlenodes-sessionprofiles.conf b/etc/broker/x2gobroker-singlenodes-sessionprofiles.conf
new file mode 100644
index 0000000..d72a68b
--- /dev/null
+++ b/etc/broker/x2gobroker-singlenodes-sessionprofiles.conf
@@ -0,0 +1,179 @@
+[siteA-serverA-GNOME]
+user=
+defsndport=true
+useiconv=false
+iconvfrom=UTF-8
+height=600
+export=
+quality=9
+fullscreen=false
+layout=
+useexports=true
+width=800
+speed=2
+soundsystem=pulse
+print=true
+type=auto
+sndport=4713
+xinerama=true
+variant=
+usekbd=true
+fstunnel=true
+applications=TERMINAL,WWWBROWSER,MAILCLIENT,OFFICE
+host=server-a.site-a.local
+multidisp=false
+sshproxyport=22
+sound=true
+rootless=false
+name=GNOME - siteA+serverA
+iconvto=UTF-8
+soundtunnel=true
+command=GNOME
+dpi=96
+sshport=22
+setdpi=0
+pack=16m-jpeg
+
+[siteA-serverA-KDE]
+user=
+defsndport=true
+useiconv=false
+iconvfrom=UTF-8
+height=600
+export=
+quality=9
+fullscreen=false
+layout=
+useexports=true
+width=800
+speed=2
+soundsystem=pulse
+print=true
+type=auto
+sndport=4713
+xinerama=true
+variant=
+usekbd=true
+fstunnel=true
+applications=TERMINAL,WWWBROWSER,MAILCLIENT,OFFICE
+host=server-a.site-a.local
+multidisp=false
+sshproxyport=22
+sound=true
+rootless=false
+name=GNOME - siteA+serverA
+iconvto=UTF-8
+soundtunnel=true
+command=GNOME
+dpi=96
+sshport=22
+setdpi=0
+pack=16m-jpeg
+
+[siteA-serverB-GNOME]
+user=
+defsndport=true
+useiconv=false
+iconvfrom=UTF-8
+height=600
+export=
+quality=9
+fullscreen=false
+layout=
+useexports=true
+width=800
+speed=2
+soundsystem=pulse
+print=true
+type=auto
+sndport=4713
+xinerama=true
+variant=
+usekbd=true
+fstunnel=true
+applications=TERMINAL,WWWBROWSER,MAILCLIENT,OFFICE
+host=server-b.site-a.local
+multidisp=false
+sshproxyport=22
+sound=true
+rootless=false
+name=GNOME - siteA+serverB
+iconvto=UTF-8
+soundtunnel=true
+command=GNOME
+dpi=96
+sshport=22
+setdpi=0
+pack=16m-jpeg
+
+[siteB-serverA-LXDE]
+user=
+defsndport=true
+useiconv=false
+iconvfrom=UTF-8
+height=600
+export=
+quality=9
+fullscreen=false
+layout=
+useexports=true
+width=800
+speed=2
+soundsystem=pulse
+print=true
+type=auto
+sndport=4713
+xinerama=true
+variant=
+usekbd=true
+fstunnel=true
+applications=TERMINAL,WWWBROWSER,MAILCLIENT,OFFICE
+host=server-a.site-b.local
+multidisp=false
+sshproxyport=22
+sound=true
+rootless=false
+name=LXDE - siteB+serverA
+iconvto=UTF-8
+soundtunnel=true
+command=LXDE
+dpi=96
+sshport=22
+setdpi=0
+pack=16m-jpeg
+
+[siteC-serverA-XFCE]
+user=
+defsndport=true
+useiconv=false
+iconvfrom=UTF-8
+height=600
+export=
+quality=9
+fullscreen=false
+layout=
+useexports=true
+width=800
+speed=2
+soundsystem=pulse
+print=true
+type=auto
+sndport=4713
+xinerama=true
+variant=
+usekbd=true
+fstunnel=true
+applications=TERMINAL,WWWBROWSER,MAILCLIENT,OFFICE
+host=server-a.site-c.local
+multidisp=false
+sshproxyport=22
+sound=true
+rootless=false
+name=XFCE - siteC+serverA
+iconvto=UTF-8
+soundtunnel=true
+command=XFCE
+dpi=96
+sshport=22
+setdpi=0
+pack=16m-jpeg
diff --git a/etc/broker/x2gobroker-singlenodes-sessionprofilesmap.conf b/etc/broker/x2gobroker-singlenodes-sessionprofilesmap.conf
new file mode 100644
index 0000000..be1e4e9
--- /dev/null
+++ b/etc/broker/x2gobroker-singlenodes-sessionprofilesmap.conf
@@ -0,0 +1,17 @@
+[siteA-serverA-GNOME]
+allow=@gnomegroup, at admingroup,adminuser
+client_subnet=<site-A/netmask-A>
+
+[siteA-serverA-KDE]
+allow-login=@gnomegroup, at admingroup,adminuser
+allow-connect=<site-A/netmask-A>,<homeoffice-IP-A>
+
+[siteA-serverB-GNOME]
+users=
+users=@
+
+[siteB-serverA-LXDE]
+users=
+
+[siteC-serverA-XFCE]
+users=
diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf
index d7a3d6a..840508e 100644
--- a/etc/x2gobroker.conf
+++ b/etc/x2gobroker.conf
@@ -86,10 +86,10 @@ enable-html-output = false
enable = true
desktop-shell = KDE
-[simple]
+[singlenodes]
enable = false
-session-profiles = /etc/x2go/x2gobroker-simple-sessionprofiles.conf
-session-profiles-map = /etc/x2go/x2gobroker-simple-sessionprofilesmap.conf
+session-profiles = /etc/x2go/broker/x2gobroker-singlenodes-sessionprofiles.conf
+session-profiles-map = /etc/x2go/broker/x2gobroker-singlenodes-sessionprofilesmap.conf
[loadbalancer]
enable = false
diff --git a/x2gobroker/backends/simple.py b/x2gobroker/backends/singlenodes.py
similarity index 88%
rename from x2gobroker/backends/simple.py
rename to x2gobroker/backends/singlenodes.py
index d1936ec..3ab4554 100644
--- a/x2gobroker/backends/simple.py
+++ b/x2gobroker/backends/singlenodes.py
@@ -19,7 +19,8 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goBrokerSIMPLE class - a simple X2GoBroker implementations that uses text-based config files only
+X2goBrokerSINGLENODES class - a simple X2GoBroker implementations that uses text-based config files only
+and does not support load balancing.
"""
__NAME__ = 'x2gobroker-pylib'
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 4d02602..009129f 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -53,10 +53,10 @@ X2GOBROKER_CONFIG_DEFAULTS = {
'enable': True,
'desktop-shell': 'KDE',
},
- 'simple': {
+ 'singlenodes': {
'enable': False,
- 'session-profiles': '/etc/x2go/x2gobroker-simple-sessionprofiles.conf',
- 'session-profiles-map': '/etc/x2go/x2gobroker-simple-sessionprofilesmap.conf',
+ 'session-profiles': '/etc/x2go/broker/x2gobroker-singlenodes-sessionprofiles.conf',
+ 'session-profiles-map': '/etc/x2go/broker/x2gobroker-singlenodes-sessionprofilesmap.conf',
},
'loadbalancer': {
'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).
More information about the x2go-commits
mailing list