x2go-commits November 2013

x2go-commits@lists.x2go.org

2 participants
391 discussions

page changed: doc:deployment-stories:electronic-glovebox
by wiki-admin＠x2go.org 20 Nov '13

20 Nov '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/11/20 10:01 Browser : Mozilla/5.0 (Windows NT 6.1; rv:25.0) Gecko/20100101 Firefox/25.0 IP-Address : 188.105.133.89 Hostname : dslb-188-105-133-089.pools.arcor-ip.net Old Revision: http://wiki.x2go.org/doku.php/doc:deployment-stories:electronic-glovebox?re… New Revision: http://wiki.x2go.org/doku.php/doc:deployment-stories:electronic-glovebox Edit Summary: User : stefanbaur @@ -5,11 +5,11 @@ The Electronic Glovebox is our implementation of a __Re__mote __Co__ntrolled __B__rowsers __S__ystem, ReCoBS. ReCoBS is a security concept designed by the German Federal Office for Information Security ([[https://www.bsi.bund.de/EN/Home/home_node.html|Bundesamt für Sicherheit in der Informationstechnik]], BSI). - It places a Terminal Server (in our case, a Linux box running X2Go) in a demilitarized zone (DMZ) between two Firewalls. This Terminal Server may freely surf the net, but it cannot initiate "downstream" connections towards the LAN. From the LAN side, it is possible to connect to the Terminal Server (in our case, via SSH), but direct outbound connections to the Internet are blocked by default. + It places a Terminal Server (in our case, a Linux box running X2Go) in a demilitarized zone (DMZ) between two Firewalls. This Terminal Server may freely surf the net, but it cannot initiate "downstream" connections towards the LAN. From the LAN side, it is possible to connect "upstream" to the Terminal Server (in our case, via X2Go/SSH), but direct outbound connections to the Internet are blocked by default. - Where we're diverting from the standard ReCoBS approach is that we're using a single firewall with a third ethernet port for the DMZ, and we're running both the firewall and the X2Go Terminal Server as virtual machines on a stripped down Debian Linux with KVM. + Where we're diverting from the standard ReCoBS approach is that we're using a single firewall with a third ethernet port for the DMZ, and we're running both the firewall and the X2Go Terminal Server as virtual machines on a stripped down Debian Linux with KVM. Also, we're providing a web proxy server with a default deny policy, so that you can whitelist "safe" domains like microsoft and antivirus updates, or online banking portals and access those using your locally installed browser or online banking software. While the system isn't limited to a particular hardware configuration (we've shipped regular midi-tower cases as well as 19", 1HU rack-mount servers), our standard model is a fanless (i.e. entirely passively cooled), very compact case with enough CPU and RAM for up to 5 concurrent users. A picture, showing the box on top of a stack of copy paper for easy size comparison, is available here: [[http://www.baur-itcs.de/20-servermodelle/10-lexcomputechtwister/]] This allows us to offer an affordable solution even for small offices like a general practicioner's office. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:deployment-stories:electronic-glovebox
by wiki-admin＠x2go.org 20 Nov '13

20 Nov '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/11/20 09:57 Browser : Mozilla/5.0 (Windows NT 6.1; rv:25.0) Gecko/20100101 Firefox/25.0 IP-Address : 149.172.200.27 Hostname : HSI-KBW-149-172-200-27.hsi13.kabel-badenwuerttemberg.de Old Revision: http://wiki.x2go.org/doku.php/doc:deployment-stories:electronic-glovebox?re… New Revision: http://wiki.x2go.org/doku.php/doc:deployment-stories:electronic-glovebox Edit Summary: User : stefanbaur @@ -13,15 +13,17 @@ While the system isn't limited to a particular hardware configuration (we've shipped regular midi-tower cases as well as 19", 1HU rack-mount servers), our standard model is a fanless (i.e. entirely passively cooled), very compact case with enough CPU and RAM for up to 5 concurrent users. A picture, showing the box on top of a stack of copy paper for easy size comparison, is available here: [[http://www.baur-itcs.de/20-servermodelle/10-lexcomputechtwister/]] This allows us to offer an affordable solution even for small offices like a general practicioner's office. - Obviously, there is a high demand for data protection solutions in the healthcare sector (as probably everyone can understand immediately). + Obviously, there is a high demand for data protection solutions in the healthcare sector (as probably everyone can understand immediately), and this is where we've sold quite a number of Electronic GloveBoxes so far. Of course, it could also be used by lawyers, product designers (think industrial espionage), and similar professions where you just don't want to see your confidential data leaked onto the Internet. - For usability reasons, we're using the X2Go Published Applications feature of the X2Go Client for providing the applications to the user - in fact, we're the ones who [[doc:sponsors|sponsored]] the development of said feature. + To provide a good user experience, we're using the X2Go Published Applications feature of the X2Go Client for providing the applications to the user - in fact, we're the ones who [[doc:sponsors|sponsored]] the development of said feature. What we're publishing is a minimal set of internet applications (browser, mail client, PDF Viewer and Open Office), accessible via right-click on the X2Go icon in the taskbar. + + Thanks to the Published Application Mode, these applications interact with the Desktop as if they were installed locally on the machine, there is no annoying full-desktop window that you need to drag out of the way to access your local applications, like you might know it from using VNC or RDP. Please visit our website for further information and to view a screencast. The website is in German only at the moment, but if you are interested in selling GloveBoxes in your country, feel free to contact us by e-Mail and we'll provide you with English translations of whatever you may need. Also, while the screencast has German on-screen text and no translation yet, it should be rather easy to figure out what it's about, even without unerstanding the language. * Overview: [[http://baur-itcs.de/10-elektronischeglovebox/]] * Screencast: [[http://baur-itcs.de/10-elektronischeglovebox/50-videos/]] * e-Mail: [[mailto:kontakt@baur-itcs.de]] -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:deployment-stories:electronic-glovebox
by wiki-admin＠x2go.org 20 Nov '13

20 Nov '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/11/20 09:47 Browser : Mozilla/5.0 (Windows NT 6.1; rv:25.0) Gecko/20100101 Firefox/25.0 IP-Address : 149.172.200.27 Hostname : HSI-KBW-149-172-200-27.hsi13.kabel-badenwuerttemberg.de Old Revision: http://wiki.x2go.org/doku.php/doc:deployment-stories:electronic-glovebox?re… New Revision: http://wiki.x2go.org/doku.php/doc:deployment-stories:electronic-glovebox Edit Summary: User : stefanbaur @@ -1,11 +1,11 @@ ====== X2Go at the Doctor's office: The Electronic Glovebox ====== //Shared by Stefan Baur, [[http://www.baur-itcs.de|BAUR-ITCS UG (Germany)]]// - The Electronic Glovebox is our implementation of a ''Re''mote ''Co''ntrolled ''B''rowsers ''S''ystem, ReCoBS. + The Electronic Glovebox is our implementation of a __Re__mote __Co__ntrolled __B__rowsers __S__ystem, ReCoBS. - ReCoBS is a security concept designed by the German Federal Office for Information Security (Bundesamt für Sicherheit in der Informationstechnik, BSI). + ReCoBS is a security concept designed by the German Federal Office for Information Security ([[https://www.bsi.bund.de/EN/Home/home_node.html|Bundesamt für Sicherheit in der Informationstechnik]], BSI). It places a Terminal Server (in our case, a Linux box running X2Go) in a demilitarized zone (DMZ) between two Firewalls. This Terminal Server may freely surf the net, but it cannot initiate "downstream" connections towards the LAN. From the LAN side, it is possible to connect to the Terminal Server (in our case, via SSH), but direct outbound connections to the Internet are blocked by default. Where we're diverting from the standard ReCoBS approach is that we're using a single firewall with a third ethernet port for the DMZ, and we're running both the firewall and the X2Go Terminal Server as virtual machines on a stripped down Debian Linux with KVM. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:deployment-stories:electronic-glovebox
by wiki-admin＠x2go.org 20 Nov '13

20 Nov '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/11/20 09:45 Browser : Mozilla/5.0 (Windows NT 6.1; rv:25.0) Gecko/20100101 Firefox/25.0 IP-Address : 188.105.133.89 Hostname : dslb-188-105-133-089.pools.arcor-ip.net Old Revision: http://wiki.x2go.org/doku.php/doc:deployment-stories:electronic-glovebox?re… New Revision: http://wiki.x2go.org/doku.php/doc:deployment-stories:electronic-glovebox Edit Summary: User : stefanbaur @@ -9,9 +9,9 @@ It places a Terminal Server (in our case, a Linux box running X2Go) in a demilitarized zone (DMZ) between two Firewalls. This Terminal Server may freely surf the net, but it cannot initiate "downstream" connections towards the LAN. From the LAN side, it is possible to connect to the Terminal Server (in our case, via SSH), but direct outbound connections to the Internet are blocked by default. Where we're diverting from the standard ReCoBS approach is that we're using a single firewall with a third ethernet port for the DMZ, and we're running both the firewall and the X2Go Terminal Server as virtual machines on a stripped down Debian Linux with KVM. - While the system isn't limited to a particular hardware configuration (we've shipped regular midi-tower cases as well as 19", 1HU rack-mount servers), our standard model is a fanless (i.e. entirely passively cooled), very compact case with enough CPU and RAM for up to 5 concurrent users. + While the system isn't limited to a particular hardware configuration (we've shipped regular midi-tower cases as well as 19", 1HU rack-mount servers), our standard model is a fanless (i.e. entirely passively cooled), very compact case with enough CPU and RAM for up to 5 concurrent users. A picture, showing the box on top of a stack of copy paper for easy size comparison, is available here: [[http://www.baur-itcs.de/20-servermodelle/10-lexcomputechtwister/]] This allows us to offer an affordable solution even for small offices like a general practicioner's office. Obviously, there is a high demand for data protection solutions in the healthcare sector (as probably everyone can understand immediately). -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:deployment-stories:electronic-glovebox
by wiki-admin＠x2go.org 20 Nov '13

20 Nov '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/11/20 09:43 Browser : Mozilla/5.0 (Windows NT 6.1; rv:25.0) Gecko/20100101 Firefox/25.0 IP-Address : 188.105.133.89 Hostname : dslb-188-105-133-089.pools.arcor-ip.net Old Revision: http://wiki.x2go.org/doku.php/doc:deployment-stories:electronic-glovebox?re… New Revision: http://wiki.x2go.org/doku.php/doc:deployment-stories:electronic-glovebox Edit Summary: User : stefanbaur @@ -1,16 +1,27 @@ - ====== X2Go in Doctor's office: The Electronic Glovebox ====== + ====== X2Go at the Doctor's office: The Electronic Glovebox ====== - //Shared by Stefan Baur, [[http://www.baur-itcs.de|ITCS-UG (Germany)]]// + //Shared by Stefan Baur, [[http://www.baur-itcs.de|BAUR-ITCS UG (Germany)]]// - The Electronic Glovebox is a firewall system targetting at connecting a general practitioner's office to the internet without endangering the intranet machines. There is a high demand in medical contexts concerning data protection (as probably everyone can understand immediately). + The Electronic Glovebox is our implementation of a ''Re''mote ''Co''ntrolled ''B''rowsers ''S''ystem, ReCoBS. - The Electronic Glovebox combines a firewall system with a secluded X2Go Server inside. The X2Go Server on the Glovebox provides a minimal set of internet applications (browser, mail client, PDF Viewer and Open Office). Whereas internet access for intranet machines is completely blocked, the intranet machines can connect to an X2Go session on the Glovebox and this X2Go server than provides internet functionality. + ReCoBS is a security concept designed by the German Federal Office for Information Security (Bundesamt für Sicherheit in der Informationstechnik, BSI). - X2Go Client uses the X2Go Published Applications feature for providing the applications to the user. + It places a Terminal Server (in our case, a Linux box running X2Go) in a demilitarized zone (DMZ) between two Firewalls. This Terminal Server may freely surf the net, but it cannot initiate "downstream" connections towards the LAN. From the LAN side, it is possible to connect to the Terminal Server (in our case, via SSH), but direct outbound connections to the Internet are blocked by default. - Please visit my site for further information and to view a screencast. Everything is in German only at the moment. + Where we're diverting from the standard ReCoBS approach is that we're using a single firewall with a third ethernet port for the DMZ, and we're running both the firewall and the X2Go Terminal Server as virtual machines on a stripped down Debian Linux with KVM. - * Overview: [[http://baur-itcs.de/10-elektronischeglovebox/]] - * Screencast: [[http://baur-itcs.de/10-elektronischeglovebox/50-videos/]] + While the system isn't limited to a particular hardware configuration (we've shipped regular midi-tower cases as well as 19", 1HU rack-mount servers), our standard model is a fanless (i.e. entirely passively cooled), very compact case with enough CPU and RAM for up to 5 concurrent users. + This allows us to offer an affordable solution even for small offices like a general practicioner's office. + Obviously, there is a high demand for data protection solutions in the healthcare sector (as probably everyone can understand immediately). + + For usability reasons, we're using the X2Go Published Applications feature of the X2Go Client for providing the applications to the user - in fact, we're the ones who [[doc:sponsors|sponsored]] the development of said feature. + + What we're publishing is a minimal set of internet applications (browser, mail client, PDF Viewer and Open Office), accessible via right-click on the X2Go icon in the taskbar. + + Please visit our website for further information and to view a screencast. The website is in German only at the moment, but if you are interested in selling GloveBoxes in your country, feel free to contact us by e-Mail and we'll provide you with English translations of whatever you may need. Also, while the screencast has German on-screen text and no translation yet, it should be rather easy to figure out what it's about, even without unerstanding the language. + + * Overview: [[http://baur-itcs.de/10-elektronischeglovebox/]] + * Screencast: [[http://baur-itcs.de/10-elektronischeglovebox/50-videos/]] + * e-Mail: [[mailto:kontakt@baur-itcs.de]] -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:sponsors
by wiki-admin＠x2go.org 20 Nov '13

20 Nov '13

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.5-3-g186910d
by git-admin＠x2go.org 18 Nov '13

18 Nov '13

The branch, release/4.0.0.x has been updated via 186910dbdd7cb875968a04ddbd8b046f953f1654 (commit) from c338b408edd49d363fa139469d6701f745315fca (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 186910dbdd7cb875968a04ddbd8b046f953f1654 Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Thu Nov 14 18:12:38 2013 +0100 Fix x2goruncommand: "type -P $cmd" can create new lines in EXEC variable if command have the arguments wich have same names as existing commands, for example "rdesktop -k nl" -> "/usr/bin/rdesktop\n/usr/bin/nl". Now we splitting $cmd and taking only first part. Conflicts (resolved by Mike Gabriel): debian/changelog x2goserver/bin/x2goruncommand ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver/bin/x2goruncommand | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9e5a9af..d0af1b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,18 @@ x2goserver (4.0.0.6-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (4.0.0.6): - Work around buggy X2Go Client on Mac OS. If the keyboard type is set to "query", we force X2GO_SET_KBD to 1. (Partly resolves: #112). + [ Oleksandr Shneyder ] + * New upstream version (4.0.0.6): + - Fix x2goruncommand: "type -P $cmd" can create new lines in EXEC + variable if command have the arguments wich have same names as existing + commands, for example "rdesktop -k nl" -> "/usr/bin/rdesktop\n/usr/bin/nl". + Now we splitting $cmd and taking only first part. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 25 Sep 2013 12:19:16 +0200 x2goserver (4.0.0.5-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 2f95341..9350352 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -183,7 +183,8 @@ if [ "$cmd" == "TERMINAL" ]; then fi fi -EXEC=`which $cmd` +WCMD=`echo $cmd | cut -d " " -f 1` +EXEC=`type -P $WCMD` EXEC_WRAPPER="" BNAME=`basename "$EXEC"` hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.6-17-gafed646
by git-admin＠x2go.org 18 Nov '13

18 Nov '13

The branch, release/4.0.1.x has been updated via afed646f8837921e9d025c1878f8bb3dff7f8363 (commit) from ff4081629e13e855527c0da1e285fb385bc58bc0 (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 afed646f8837921e9d025c1878f8bb3dff7f8363 Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Thu Nov 14 18:12:38 2013 +0100 Fix x2goruncommand: "type -P $cmd" can create new lines in EXEC variable if command have the arguments wich have same names as existing commands, for example "rdesktop -k nl" -> "/usr/bin/rdesktop\n/usr/bin/nl". Now we splitting $cmd and taking only first part. Conflicts (resolved by Mike Gabriel): x2goserver/bin/x2goruncommand ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2goserver/bin/x2goruncommand | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 13e5757..1adfedb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,11 +110,19 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low x2goserver (4.0.0.6-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (4.0.0.6): - Work around buggy X2Go Client on Mac OS. If the keyboard type is set to "query", we force X2GO_SET_KBD to 1. (Partly resolves: #112). + [ Oleksandr Shneyder ] + * New upstream version (4.0.0.6): + - Fix x2goruncommand: "type -P $cmd" can create new lines in EXEC + variable if command have the arguments wich have same names as existing + commands, for example "rdesktop -k nl" -> "/usr/bin/rdesktop\n/usr/bin/nl". + Now we splitting $cmd and taking only first part. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 25 Sep 2013 12:19:16 +0200 x2goserver (4.0.0.5-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index bd855c4..b0cb584 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -189,7 +189,8 @@ if [ "$cmd" == "TERMINAL" ]; then fi fi -EXEC=`type -P $cmd` +WCMD=`echo $cmd | cut -d " " -f 1` +EXEC=`type -P $WCMD` EXEC_WRAPPER="" BNAME=`basename "$EXEC"` hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-234-g8d72da3
by git-admin＠x2go.org 18 Nov '13

18 Nov '13

The branch, master has been updated via 8d72da3d2d79febdb38d2949e70ee879072aec77 (commit) from e624ebc4909db5813271b07e9544cd3474ead94e (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 8d72da3d2d79febdb38d2949e70ee879072aec77 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 18 15:39:28 2013 +0100 Start/resume rootless sessions without geometry parameter. Esp. using X2GO_GEOMETRY=fullscreen for rootless sessions lead to an extra 1x1 px session window (nxagentCreateIconWindow in nxagent's Window.c). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2goserver/bin/x2goresume-session | 23 ++++++++++++++++++----- x2goserver/bin/x2gostartagent | 34 ++++++++++++++++++++++++++-------- 3 files changed, 47 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0abc0b1..9344fe6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,9 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low x2goserver.conf in new x2goserver-common package. + Move several x2goserver-* package to x2goserver's Recommends field. + Add Reinhard Tartler to Uploaders. + + Start/resume rootless sessions without geometry parameter. Esp. using + X2GO_GEOMETRY=fullscreen for rootless sessions lead to an extra 1x1 px + session window (nxagentCreateIconWindow in nxagent's Window.c). * /debian/x2goserver.init: + Rely on $PATH when invoking x2gocleansessions. * Move code in pre/post+inst/rm scripts around (from x2goserver package diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index f3a1387..4afe24b 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -43,13 +43,22 @@ fi $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" -if [ "$X2GO_GEOMETRY" == "" ] -then - X2GO_GEOMETRY=fullscreen + +# rootless sessions require to be resizable +if [ "$SESSION_TYPE" == "R" ]; then + X2GO_RESIZE=1 fi -if [ "$X2GO_GEOMETRY" == "fullscreen" ] -then +# rootless sessions of geometry fullscreen are invalid +if [ "$X2GO_GEOMETRY" == "fullscreen" ] && [ "$SESSION_TYPE" == "R" ]; then + X2GO_GEOMETRY="" +fi + +# no geometry for desktop sessions shall result in fullscreen desktop sessions +if [ "$X2GO_GEOMETRY" == "" ] && [ "$SESSION_TYPE" == "D" ]; then + X2GO_GEOMETRY="fullscreen" +fi +if [ "$X2GO_GEOMETRY" == "fullscreen" ]; then X2GO_RESIZE=1 X2GO_FULLSCREEN=1 fi @@ -146,6 +155,10 @@ NEWOPTIONS=`echo "$OPTIONS" | sed -e "s/$LSTR/link=$X2GO_LINK/"\ -e "s/$LISTSTR/listen=$GR_PORT/"\ -e "s/$FSTR/fullscreen=$X2GO_FULLSCREEN/"` +if [ -z "$X2GO_GEOMETRY" ] || [ "$X2GO_GEOMETRY" == "fullscreen" ]; then + NEWOPTIONS=`echo $NEWOPTIONS | sed -e "s/geometry=${X2GO_GEOMETRY},//"` +fi + X2GO_CLIENT=`echo "$SSH_CLIENT" | awk '{print $1}'` if [ "$X2GO_CLIENT" == "" ] then diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 7b94862..528db6f 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -217,16 +217,26 @@ while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; d fi done +# rootless sessions require to be resizable +if [ "$SESSION_TYPE" == "R" ]; then + X2GO_RESIZE=1 +fi -if [ "$X2GO_GEOMETRY" == "" ]; then - X2GO_GEOMETRY=fullscreen +# rootless sessions of geometry fullscreen are invalid +if [ "$X2GO_GEOMETRY" == "fullscreen" ] && [ "$SESSION_TYPE" == "R" ]; then + X2GO_GEOMETRY="" fi +# no geometry for desktop sessions shall result in fullscreen desktop sessions +if [ "$X2GO_GEOMETRY" == "" ] && [ "$SESSION_TYPE" == "D" ]; then + X2GO_GEOMETRY="fullscreen" +fi if [ "$X2GO_GEOMETRY" == "fullscreen" ]; then X2GO_RESIZE=1 X2GO_FULLSCREEN=1 fi +# shadow sessions are never fullscreen session and adopt the original session's geometry if [ "$X2GO_STYPE" == "S" ]; then X2GO_GEOMETRY=`DISPLAY="$SHADOW_DESKTOP" xwininfo -root | grep geometry` X2GO_GEOMETRY=`echo "$X2GO_GEOMETRY" | sed -e "s/ //g"` @@ -257,7 +267,6 @@ fi X2GO_COOKIE=`mcookie` - PATH="${PATH}:${X2GO_BIN}/" export PATH @@ -266,10 +275,15 @@ xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "$ xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" +option_geometry="" +if [ -n "$X2GO_GEOMETRY" ] && [ "$X2GO_GEOMETRY" != "fullscreen" ]; then + option_geometry="geometry=${X2GO_GEOMETRY}," +fi + if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ];then - X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_LOG},kbtype=null/null,geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" + X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_LOG},kbtype=null/null,${option_geometry}resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" else - X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_LOG},kbtype=${X2GO_KBD_TYPE},geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" + X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_LOG},kbtype=${X2GO_KBD_TYPE},${option_geometry}resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" fi @@ -299,13 +313,17 @@ fi x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-start || true SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" +agent_geometry="" +if [ -n "$X2GO_GEOMETRY" ] && [ "$X2GO_GEOMETRY" != "fullscreen" ]; then + agent_geometry="-geometry ${X2GO_GEOMETRY}" +fi if [ "$X2GO_STYPE" == "S" ]; then # set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use - NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & + NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE $agent_geometry -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & else # set NX_TEMP to /tmp, make sure x2goagent starts when pam_tmpdir.so is in use - NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & + NX_TEMP=/tmp x2goagent $X2GO_NXAGENT_OPTIONS $NOLISTOPT $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" $agent_geometry -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_LOG}" & fi ln -s "${SESSION_LOG}" "${SESSION_DIR}/session.log" @@ -331,7 +349,7 @@ X2GO_SND_PORT=1024 if [ -n "$SHADREQ_USER" ]; then $X2GO_LIB_PATH/x2gocreateshadowsession "$X2GO_COOKIE" "$X2GO_AGENT_PID" "$X2GO_CLIENT" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" "$SESSION_NAME" "$SHADREQ_USER" > /dev/null else - $X2GO_LIB_PATH/x2gocreatesession "$X2GO_COOKIE" "$X2GO_AGENT_PID" "$X2GO_CLIENT" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" "$SESSION_NAME" > /dev/null# + $X2GO_LIB_PATH/x2gocreatesession "$X2GO_COOKIE" "$X2GO_AGENT_PID" "$X2GO_CLIENT" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" "$SESSION_NAME" > /dev/null fi if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" != "auto" ]; then hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-235-gad0de63
by git-admin＠x2go.org 18 Nov '13

18 Nov '13

The branch, master has been updated via ad0de63a8cda0b766fc5d197976059ec7222c3a3 (commit) from 8d72da3d2d79febdb38d2949e70ee879072aec77 (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 ad0de63a8cda0b766fc5d197976059ec7222c3a3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 18 16:11:40 2013 +0100 move x2goruncommand fix to upstream LTS release (4.0.0.6) ----------------------------------------------------------------------- Summary of changes: debian/changelog | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9344fe6..af63bba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,13 +64,6 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.1.0.0): - Use new script x2gopath in Perl::API. (Fixes: #86). - [ Oleksandr Shneyder ] - * New upstream version (4.1.0.0): - - fixed x2goruncommand: "type -P $cmd" can create new lines in EXEC - variable if command have the arguments wich have same names as existing - commands, for example "rdesktop -k nl" -> "/usr/bin/rdesktop\n/usr/bin/nl". - Now we splitting $cmd and taking only first part. - -- Reinhard Tartler <siretart(a)tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low @@ -185,11 +178,19 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low x2goserver (4.0.0.6-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (4.0.0.6): - Work around buggy X2Go Client on Mac OS. If the keyboard type is set to "query", we force X2GO_SET_KBD to 1. (Partly resolves: #112). + [ Oleksandr Shneyder ] + * New upstream version (4.0.0.6): + - Fix x2goruncommand: "type -P $cmd" can create new lines in EXEC + variable if command have the arguments wich have same names as existing + commands, for example "rdesktop -k nl" -> "/usr/bin/rdesktop\n/usr/bin/nl". + Now we splitting $cmd and taking only first part. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 25 Sep 2013 12:19:16 +0200 x2goserver (4.0.0.5-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2013