x2go-commits October 2013

x2go-commits@lists.x2go.org

2 participants
100 discussions

x2goclient.git - master (branch) updated: 4.0.1.1-11-gcf33d55
by git-admin＠x2go.org 24 Oct '13

24 Oct '13

The branch, master has been updated via cf33d551c21c86c7ea654914930550b0fd0b2c79 (commit) from 8cade0ed5bc2e7595d394857f56308c55138f862 (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 cf33d551c21c86c7ea654914930550b0fd0b2c79 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 24 10:10:53 2013 +0200 Store broker HTTPS certificate exceptions in $HOME/.x2go/ssl/exceptions (before: $HOME/ssl/exceptions). (Fixes: #328). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ httpbrokerclient.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 05b5189..e484ba5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low + Provide Keywords: key in .desktop file. + Add NSIS packaging files for win32 builds to source tree. (Files provided by Oleksandr Shneyder, thanks!!!). + + Store broker HTTPS certificate exceptions in + $HOME/.x2go/ssl/exceptions (before: $HOME/ssl/exceptions). + (Fixes: #328). * Pull-in packaging changes from Debian. [ Ricardo Díaz Martín ] diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index 603aadd..6d16b7b 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -532,10 +532,10 @@ void HttpBrokerClient::slotSslErrors ( const QList<QSslError> & errors ) fname=fname.replace(":","_"); QUrl lurl ( config->brokerurl ); QString homeDir=mainWindow->getHomeDirectory(); - if ( QFile::exists ( homeDir+"/ssl/exceptions/"+ + if ( QFile::exists ( homeDir+"/.x2go/ssl/exceptions/"+ lurl.host() +"/"+fname ) ) { - QFile fl ( homeDir+"/ssl/exceptions/"+ + QFile fl ( homeDir+"/.x2go/ssl/exceptions/"+ lurl.host() +"/"+fname ); fl.open ( QIODevice::ReadOnly | QIODevice::Text ); QSslCertificate mcert ( &fl ); @@ -606,14 +606,14 @@ void HttpBrokerClient::slotSslErrors ( const QList<QSslError> & errors ) { x2goDebug<<"accept certificate"; QDir dr; - dr.mkpath ( homeDir+"/ssl/exceptions/"+lurl.host() +"/" ); - QFile fl ( homeDir+"/ssl/exceptions/"+ + dr.mkpath ( homeDir+"/.x2go/ssl/exceptions/"+lurl.host() +"/" ); + QFile fl ( homeDir+"/.x2go/ssl/exceptions/"+ lurl.host() +"/"+fname ); fl.open ( QIODevice::WriteOnly | QIODevice::Text ); QTextStream ( &fl ) <<cert.toPem(); fl.close(); http->ignoreSslErrors(); - x2goDebug<<"store certificate in "<<homeDir+"/ssl/exceptions/"+ + x2goDebug<<"store certificate in "<<homeDir+"/.x2go/ssl/exceptions/"+ lurl.host() +"/"+fname; requestTime.restart(); } hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

python-x2go.git - twofactorauth (branch) updated: 0.4.0.8-25-gd663705
by git-admin＠x2go.org 24 Oct '13

24 Oct '13

The branch, twofactorauth has been updated via d66370581a407088c86f9a519947bba1cd401e4b (commit) from fd9fe9272f204deb7aa0f608950aa7bc2d633fdc (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 d66370581a407088c86f9a519947bba1cd401e4b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 24 09:54:59 2013 +0200 debian/control: Drop python-cups from Depends: field. Python CUPS is no dependency if Python X2Go. (Fixes: #329). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ debian/control | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 58ba6fb..5c91529 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,11 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Warn about Parmiko/SSH versions that do not yet support twofactor authentication with password/passphrase being different. + [ Orion Poplawski ] + * debian/control: + + Drop python-cups from Depends: field. Python CUPS is no dependency if + Python X2Go. (Fixes: #329). + [ Kenneth Pedersen ] * New upstream version (0.4.0.9): - Color depth detection: Stop using win32api.GetSystemMetrics(2) which actually diff --git a/debian/control b/debian/control index ad1071b..b49c765 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,6 @@ Depends: ${misc:Depends}, python-gevent (>= 0.13.6-0~), python-paramiko (>= 1.8.0-0~), - python-cups, python-xlib, nxproxy Recommends: hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.4.0.8-15-g6bc5020
by git-admin＠x2go.org 24 Oct '13

24 Oct '13

The branch, master has been updated via 6bc50204f851133b284e8f3ba388101118fae2f9 (commit) from 732635efb177910d23b544d2e05e09559c8af5ff (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 6bc50204f851133b284e8f3ba388101118fae2f9 Author: Orion Poplawski <orion(a)cora.nwra.com> Date: Thu Oct 24 09:54:59 2013 +0200 debian/control: Drop python-cups from Depends: field. Python CUPS is no dependency if Python X2Go. (Fixes: #329). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ debian/control | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index de471fb..ac9dc1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,11 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Rewrite passwords that are not string/unicode to an empty string. - No Unicode chars in log messages. Eliminated one more in checkhosts.py. + [ Orion Poplawski ] + * debian/control: + + Drop python-cups from Depends: field. Python CUPS is no dependency if + Python X2Go. (Fixes: #329). + [ Kenneth Pedersen ] * New upstream version (0.4.0.9): - Color depth detection: Stop using win32api.GetSystemMetrics(2) which actually diff --git a/debian/control b/debian/control index ad1071b..b49c765 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,6 @@ Depends: ${misc:Depends}, python-gevent (>= 0.13.6-0~), python-paramiko (>= 1.8.0-0~), - python-cups, python-xlib, nxproxy Recommends: hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.4.0.8-14-g732635e
by git-admin＠x2go.org 24 Oct '13

24 Oct '13

The branch, master has been updated via 732635efb177910d23b544d2e05e09559c8af5ff (commit) from 058bc7b3d319e91a07c39804aaa9e118dc116334 (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 732635efb177910d23b544d2e05e09559c8af5ff Author: Kenneth Pedersen <kenneth(a)wangpedersen.com> Date: Thu Oct 24 09:50:00 2013 +0200 Color depth detection: Stop using win32api.GetSystemMetrics(2) which actually returns the width of a vertical scroll bar in pixels. Instead, create a screen display context and query it for the color depth. (Fixes: #330). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2go/utils.py | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8c6ee9e..de471fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (0.4.0.9): - Agent channels in Paramiko can raise an EOFError if the connection has got disrupted. Ignoring this. @@ -16,6 +17,12 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Rewrite passwords that are not string/unicode to an empty string. - No Unicode chars in log messages. Eliminated one more in checkhosts.py. + [ Kenneth Pedersen ] + * New upstream version (0.4.0.9): + - Color depth detection: Stop using win32api.GetSystemMetrics(2) which actually + returns the width of a vertical scroll bar in pixels. Instead, create a screen + display context and query it for the color depth. (Fixes: #330). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200 python-x2go (0.4.0.8-0~x2go1) unstable; urgency=low diff --git a/x2go/utils.py b/x2go/utils.py index e8d80bc..c6db2de 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -46,8 +46,9 @@ if _X2GOCLIENT_OS != 'Windows': from defaults import X_DISPLAY as _X_DISPLAY if _X2GOCLIENT_OS == 'Windows': - import win32api import win32gui + import win32print + import win32con def is_in_nx3packmethods(method): @@ -555,8 +556,10 @@ def local_color_depth(): return 24 else: - return win32api.GetSystemMetrics(2) - + # This gets the color depth of the primary monitor. All monitors need not have the same color depth. + dc = win32gui.GetDC(None) + _depth = win32print.GetDeviceCaps(dc, win32con.BITSPIXEL) * win32print.GetDeviceCaps(dc, win32con.PLANES) + win32gui.ReleaseDC(None, dc) def is_color_depth_ok(depth_session, depth_local): """\ hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - twofactorauth (branch) updated: 0.4.0.8-24-gfd9fe92
by git-admin＠x2go.org 24 Oct '13

24 Oct '13

The branch, twofactorauth has been updated via fd9fe9272f204deb7aa0f608950aa7bc2d633fdc (commit) from efcb8afc6c0efd744ffa60db340efdceaac196ac (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 fd9fe9272f204deb7aa0f608950aa7bc2d633fdc Author: Kenneth Pedersen <kenneth(a)wangpedersen.com> Date: Thu Oct 24 09:50:00 2013 +0200 Color depth detection: Stop using win32api.GetSystemMetrics(2) which actually returns the width of a vertical scroll bar in pixels. Instead, create a screen display context and query it for the color depth. (Fixes: #330). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2go/utils.py | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8aa3264..58ba6fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (0.4.0.9): - Agent channels in Paramiko can raise an EOFError if the connection has got disrupted. Ignoring this. @@ -21,6 +22,12 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Warn about Parmiko/SSH versions that do not yet support twofactor authentication with password/passphrase being different. + [ Kenneth Pedersen ] + * New upstream version (0.4.0.9): + - Color depth detection: Stop using win32api.GetSystemMetrics(2) which actually + returns the width of a vertical scroll bar in pixels. Instead, create a screen + display context and query it for the color depth. (Fixes: #330). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200 python-x2go (0.4.0.8-0~x2go1) unstable; urgency=low diff --git a/x2go/utils.py b/x2go/utils.py index e8d80bc..c6db2de 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -46,8 +46,9 @@ if _X2GOCLIENT_OS != 'Windows': from defaults import X_DISPLAY as _X_DISPLAY if _X2GOCLIENT_OS == 'Windows': - import win32api import win32gui + import win32print + import win32con def is_in_nx3packmethods(method): @@ -555,8 +556,10 @@ def local_color_depth(): return 24 else: - return win32api.GetSystemMetrics(2) - + # This gets the color depth of the primary monitor. All monitors need not have the same color depth. + dc = win32gui.GetDC(None) + _depth = win32print.GetDeviceCaps(dc, win32con.BITSPIXEL) * win32print.GetDeviceCaps(dc, win32con.PLANES) + win32gui.ReleaseDC(None, dc) def is_color_depth_ok(depth_session, depth_local): """\ hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-215-g538f5a7
by git-admin＠x2go.org 24 Oct '13

24 Oct '13

The branch, master has been updated via 538f5a7d20af6a74e8a6720214030d216a39329b (commit) from 6b7b20325f154f16a9c22c22187690521f90b213 (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 538f5a7d20af6a74e8a6720214030d216a39329b Author: Helmer Teles <helmer.teles(a)mykolab.com> Date: Thu Oct 24 08:59:26 2013 +0200 Make umask that is used when mounting client-side folders via SSHFS configurable in x2goserver.conf. (Fixes: #331). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ x2goserver/bin/x2gomountdirs | 17 +++++++++++++++-- x2goserver/etc/x2goserver.conf | 4 ++++ 3 files changed, 24 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4af91da..ecc5d6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,11 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low - Move xfonts-base from Recommends: field to Depends: field (bin:package x2goserver). + [ Helmer Teles ] + * New upstream version (4.0.1.7): + - Make umask that is used when mounting client-side folders via SSHFS + configurable in x2goserver.conf. (Fixes: #331). + [ Jürgen Hötzel ] * New upstream version (4.0.1.7): - Use bash-builtin 'type' instead of to be avoided 'which'. (Fixes: #305). diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 3152fb2..0cb31c3 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -246,15 +246,28 @@ for (my $i=0;$i<@dirs;$i++) if (db_insertmount( $session, $mntpath, $host)) { + + my $Config = new Config::Simple(syntax=>'ini'); + $Config->read('/etc/x2go/x2goserver.conf' ); + my $umask=$Config->param("security.umask"); + my $umaskstr=""; + + if ($umask ne "") + { + $umaskstr="umask=$umask"; + } else { + $umaskstr="default_permissions"; + } my $code_conv=$ENV{'X2GO_ICONV'}; + if ($code_conv ne "") { $code_conv="-o $code_conv"; } - $msg = "sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; + $msg = "sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; syslog('debug', "executing: $msg"); print "inserted, $msg\n"; - if (system("sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0) + if (system("sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0) { print "mount @dirs[$i] ok\n"; syslog('notice', "successfully mounted $user\@$host:$port@dirs[$i] to $mntpath"); diff --git a/x2goserver/etc/x2goserver.conf b/x2goserver/etc/x2goserver.conf index 5fa6baf..c9fe270 100644 --- a/x2goserver/etc/x2goserver.conf +++ b/x2goserver/etc/x2goserver.conf @@ -4,6 +4,10 @@ [limit groups] #bar-group=1 +[security] +# SSHFS umask for client-side folder sharing. Leave uncommented to keep the server's default umask +#umask="0117" + [log] # possible levels are: emerg, alert, crit, err, warning, notice, info, debug loglevel=notice 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-11-gc3be1cd
by git-admin＠x2go.org 24 Oct '13

24 Oct '13

The branch, release/4.0.1.x has been updated via c3be1cdb1145b0d6ebdc27f0aa1c2b8564f0000b (commit) from a7d331d0fc0e2e1814a081d434fad5d5d1d6511a (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 c3be1cdb1145b0d6ebdc27f0aa1c2b8564f0000b Author: Helmer Teles <helmer.teles(a)mykolab.com> Date: Thu Oct 24 08:59:26 2013 +0200 Make umask that is used when mounting client-side folders via SSHFS configurable in x2goserver.conf. (Fixes: #331). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ x2goserver/bin/x2gomountdirs | 17 +++++++++++++++-- x2goserver/etc/x2goserver.conf | 4 ++++ 3 files changed, 24 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 46354a8..d40a494 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,11 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low - Move xfonts-base from Recommends: field to Depends: field (bin:package x2goserver). + [ Helmer Teles ] + * New upstream version (4.0.1.7): + - Make umask that is used when mounting client-side folders via SSHFS + configurable in x2goserver.conf. (Fixes: #331). + [ Jürgen Hötzel ] * New upstream version (4.0.1.7): - Use bash-builtin 'type' instead of to be avoided 'which'. (Fixes: #305). diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 10c40e2..8905672 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -267,15 +267,28 @@ for (my $i=0;$i<@dirs;$i++) if (db_insertmount( $session, $mntpath, $host)) { + + my $Config = new Config::Simple(syntax=>'ini'); + $Config->read('/etc/x2go/x2goserver.conf' ); + my $umask=$Config->param("security.umask"); + my $umaskstr=""; + + if ($umask ne "") + { + $umaskstr="umask=$umask"; + } else { + $umaskstr="default_permissions"; + } my $code_conv=$ENV{'X2GO_ICONV'}; + if ($code_conv ne "") { $code_conv="-o $code_conv"; } - $msg = "sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; + $msg = "sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; syslog('debug', "executing: $msg"); print "inserted, $msg\n"; - if (system("sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0) + if (system("sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 2>>~/mounts.log")==0) { print "mount @dirs[$i] ok\n"; syslog('notice', "successfully mounted $user\@$host:$port@dirs[$i] to $mntpath"); diff --git a/x2goserver/etc/x2goserver.conf b/x2goserver/etc/x2goserver.conf index 5fa6baf..c9fe270 100644 --- a/x2goserver/etc/x2goserver.conf +++ b/x2goserver/etc/x2goserver.conf @@ -4,6 +4,10 @@ [limit groups] #bar-group=1 +[security] +# SSHFS umask for client-side folder sharing. Leave uncommented to keep the server's default umask +#umask="0117" + [log] # possible levels are: emerg, alert, crit, err, warning, notice, info, debug loglevel=notice 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

x2gobroker.git - master (branch) updated: 0.0.2.3-55-g2bca21c
by git-admin＠x2go.org 23 Oct '13

23 Oct '13

The branch, master has been updated via 2bca21cc7a4bb982f5b37149673a43bf150a0e7e (commit) from 11a95dee05bb6ebad3da423eea72323ec4d65051 (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 2bca21cc7a4bb982f5b37149673a43bf150a0e7e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 10 12:05:50 2013 +0200 drop duplicate code ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 10 ---------- 1 file changed, 10 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index b23f1ad..9688442 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -169,16 +169,6 @@ logger_broker.info(' X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=x2gobrok logger_broker.info(' X2GOBROKER_SSL_CERTFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE)) logger_broker.info(' X2GOBROKER_SSL_KEYFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE)) -interactive_mode_warning = False -# check effective UID the broker runs as and complain appropriately... -if x2gobroker.defaults.X2GOBROKER_USER != x2gobroker.defaults.X2GOBROKER_DAEMON_USER and os.geteuid() != 0: - interactive_mode_warning = True -elif x2gobroker.defaults.X2GOBROKER_DAEMON_USER != 'root' and os.geteuid() == 0: - logger_broker.warn('X2Go Session Broker should not be run as root,') - logger_broker.warn(' better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) -elif os.geteuid() == 0: - logger_broker.warn('X2Go Session Broker should not be run as root, better run as non-privileged user') - # run the web.py standalone daemon... if __name__ == "__main__": 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-56-g62eaea2
by git-admin＠x2go.org 23 Oct '13

23 Oct '13

The branch, master has been updated via 62eaea2679bfb682a6f5a5c56491e33d943e3b20 (commit) from 2bca21cc7a4bb982f5b37149673a43bf150a0e7e (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 62eaea2679bfb682a6f5a5c56491e33d943e3b20 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 23 22:03:30 2013 +0200 Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5720e4b..c1017c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low style. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi. * /debian/x2gobroker-agent.dirs: + Provide empty log file directory. diff --git a/debian/control b/debian/control index dbd1b6f..77ff00b 100644 --- a/debian/control +++ b/debian/control @@ -157,8 +157,9 @@ Depends: python, adduser, x2gobroker (>= ${source:Version}), x2gobroker (<< ${source:Version}.1~), -Suggests: +Recommends: apache2, + libapache2-mod-wsgi, Description: X2Go http(s) based session broker (CGI) X2Go is a server based computing environment with - session resuming 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).

1 0

page changed: wiki:repositories:start
by wiki-admin＠x2go.org 22 Oct '13

22 Oct '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/10/22 12:55 Browser : Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36 IP-Address : 72.94.83.13 Hostname : pool-72-94-83-13.phlapa.fios.verizon.net Old Revision: http://wiki.x2go.org/doku.php/wiki:repositories:start?rev=1364292043 New Revision: http://wiki.x2go.org/doku.php/wiki:repositories:start Edit Summary: [Fedora] Fedora 17 no longer available on OBS (F17 is EOL) User : mikedep333 @@ -47,9 +47,8 @@ ===== Fedora ===== * Project Home: [[https://build.opensuse.org/project/show?project=X11%3ARemoteDesktop%3Ax2go|… Build Service]] * Maintainer: Jan Engelhardt - * Repository Files (save to /etc/yum.repos.d/): [[http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/Fedora_1… 18]], [[http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/Fedora_1… 17]] - + * Repository Files (save to /etc/yum.repos.d/): [[http://download.opensuse.org/repositories/X11:/RemoteDesktop:/x2go/Fedora_1… 18]] ===== Others ===== * ... -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits October 2013