Dirk Mueller
f047e239d0
- Add xrdp-disable-8-bpp-vnc-support.patch:
Disable 8 bpp vnc support. Xvnc drops support for 8 bpp since
1.4.0. Trying to launch Xvnc in 8 bpp will cause it to dump core
(bsc#991059).
- Add obs source services:
+ tar_scm
+ recompress
+ set_version
- Update to version 0.9.0~git.1456906198.f422461:
Fix tarball naming from 0.9.0git to 0.9.0~git to conform openSUSE
naming scheme for pre-release version.
+ Numlock out of sync fix
+ neutrinordp: minor changes, coding style, log level
+ Update faq-compile.txt
+ Change to allow authentication against all authentication
methods.
+ Add details for crypt_level=fips to man page
+ libxrdp: no logic change, tabs to spaces
+ libxrdp: opps, fix typeo
+ Fix "\ _" on jp keyboard
+ xrdp_keyboard.ini: Fix jp keyboard model
+ update xorgxrdp
+ add keyboard options to xrdp_client_info
+ xorgxrdp=68412e5
- Add an extra legacy service action force_stop:
Forcefully killing xrdp processes when it cannot be stopped
normally.
Usage:
$ service xrdp force_stop
or
OBS-URL: https://build.opensuse.org/request/show/423916
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=5
191 lines
3.7 KiB
Diff
191 lines
3.7 KiB
Diff
From 9359e6228d702dc4d3cc8057c05e2b3bae267406 Mon Sep 17 00:00:00 2001
|
|
From: Felix Zhang <fezhang@suse.com>
|
|
Date: Wed, 17 Aug 2016 17:07:32 +0800
|
|
Subject: [PATCH] default config
|
|
|
|
---
|
|
instfiles/xrdp.service | 7 +++---
|
|
instfiles/xrdp.sh | 4 ++--
|
|
sesman/sesman.ini | 18 ++++-----------
|
|
xrdp/xrdp.ini | 62 ++++++++------------------------------------------
|
|
4 files changed, 20 insertions(+), 71 deletions(-)
|
|
|
|
diff --git a/instfiles/xrdp.service b/instfiles/xrdp.service
|
|
index 7bb076d..93117d4 100644
|
|
--- a/instfiles/xrdp.service
|
|
+++ b/instfiles/xrdp.service
|
|
@@ -1,14 +1,13 @@
|
|
[Unit]
|
|
Description=xrdp daemon
|
|
-Requires=xrdp-sesman.service
|
|
-After=syslog.target network.target xrdp-sesman.service
|
|
+After=syslog.target network.target
|
|
|
|
[Service]
|
|
Type=forking
|
|
PIDFile=/var/run/xrdp.pid
|
|
EnvironmentFile=/etc/sysconfig/xrdp
|
|
-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
|
|
-ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
|
|
+ExecStart=/etc/xrdp/xrdp.sh start
|
|
+ExecStop=/etc/xrdp/xrdp.sh stop
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|
|
diff --git a/instfiles/xrdp.sh b/instfiles/xrdp.sh
|
|
index 3e72743..630fa5b 100755
|
|
--- a/instfiles/xrdp.sh
|
|
+++ b/instfiles/xrdp.sh
|
|
@@ -17,8 +17,8 @@
|
|
# Description: starts xrdp
|
|
### END INIT INFO
|
|
|
|
-SBINDIR=/usr/local/sbin
|
|
-LOG=/dev/null
|
|
+SBINDIR=/usr/sbin
|
|
+LOG=/var/log/xrdp.log
|
|
CFGDIR=/etc/xrdp
|
|
|
|
if ! test -x $SBINDIR/xrdp
|
|
diff --git a/sesman/sesman.ini b/sesman/sesman.ini
|
|
index a58af38..e60aaa9 100644
|
|
--- a/sesman/sesman.ini
|
|
+++ b/sesman/sesman.ini
|
|
@@ -15,11 +15,10 @@ TerminalServerAdmins=tsadmins
|
|
AlwaysGroupCheck = false
|
|
|
|
[Sessions]
|
|
-
|
|
## X11DisplayOffset - x11 display number offset
|
|
# Type: integer
|
|
-# Default: 10
|
|
-X11DisplayOffset=10
|
|
+# Default: 200
|
|
+X11DisplayOffset=200
|
|
|
|
## MaxSessions - maximum number of connections to an xrdp server
|
|
# Type: integer
|
|
@@ -58,16 +57,9 @@ Policy=Default
|
|
|
|
[Logging]
|
|
LogFile=xrdp-sesman.log
|
|
-LogLevel=DEBUG
|
|
-EnableSyslog=1
|
|
-SyslogLevel=DEBUG
|
|
-
|
|
-[X11rdp]
|
|
-param1=-bs
|
|
-param2=-ac
|
|
-param3=-nolisten
|
|
-param4=tcp
|
|
-param5=-uds
|
|
+LogLevel=ERROR
|
|
+EnableSyslog=0
|
|
+SyslogLevel=ERROR
|
|
|
|
[Xvnc]
|
|
param1=-bs
|
|
diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini
|
|
index 34adb07..a48ec48 100644
|
|
--- a/xrdp/xrdp.ini
|
|
+++ b/xrdp/xrdp.ini
|
|
@@ -70,7 +70,7 @@ use_fastpath=both
|
|
#ls_title=My Login Title
|
|
|
|
# top level window background color in RGB format
|
|
-ls_top_window_bg_color=009cb5
|
|
+ls_top_window_bg_color=000000
|
|
|
|
# width and height of login screen
|
|
ls_width=350
|
|
@@ -113,9 +113,9 @@ ls_btn_cancel_height=30
|
|
|
|
[Logging]
|
|
LogFile=xrdp.log
|
|
-LogLevel=DEBUG
|
|
-EnableSyslog=1
|
|
-SyslogLevel=DEBUG
|
|
+LogLevel=ERROR
|
|
+EnableSyslog=0
|
|
+SyslogLevel=ERROR
|
|
# LogLevel and SysLogLevel could by any of: core, error, warning, info or debug
|
|
|
|
[channels]
|
|
@@ -140,67 +140,25 @@ tcutils=true
|
|
# chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210
|
|
|
|
[xrdp1]
|
|
-name=sesman-X11rdp
|
|
-lib=libxup.so
|
|
-username=ask
|
|
-password=ask
|
|
-ip=127.0.0.1
|
|
-port=-1
|
|
-xserverbpp=24
|
|
-code=10
|
|
-
|
|
-[xrdp2]
|
|
name=sesman-Xvnc
|
|
lib=libvnc.so
|
|
username=ask
|
|
password=ask
|
|
ip=127.0.0.1
|
|
port=-1
|
|
-#delay_ms=2000
|
|
+# delay in milliseconds before connecting to Xvnc
|
|
+# to avoid race condition:
|
|
+# https://github.com/neutrinolabs/xrdp/issues/182
|
|
+delay_ms=2000
|
|
|
|
-[xrdp3]
|
|
+[xrdp2]
|
|
name=console
|
|
lib=libvnc.so
|
|
ip=127.0.0.1
|
|
port=5900
|
|
username=na
|
|
password=ask
|
|
-#delay_ms=2000
|
|
-
|
|
-[xrdp4]
|
|
-name=vnc-any
|
|
-lib=libvnc.so
|
|
-ip=ask
|
|
-port=ask5900
|
|
-username=na
|
|
-password=ask
|
|
-#pamusername=asksame
|
|
-#pampassword=asksame
|
|
-#pamsessionmng=127.0.0.1
|
|
-#delay_ms=2000
|
|
-
|
|
-[xrdp5]
|
|
-name=sesman-any
|
|
-lib=libvnc.so
|
|
-ip=ask
|
|
-port=-1
|
|
-username=ask
|
|
-password=ask
|
|
-#delay_ms=2000
|
|
-
|
|
-[xrdp6]
|
|
-name=rdp-any
|
|
-lib=librdp.so
|
|
-ip=ask
|
|
-port=ask3389
|
|
-
|
|
-[xrdp7]
|
|
-name=neutrinordp-any
|
|
-lib=libxrdpneutrinordp.so
|
|
-ip=ask
|
|
-port=ask3389
|
|
-username=ask
|
|
-password=ask
|
|
+delay_ms=2000
|
|
|
|
[Session manager]
|
|
name=Session manager
|
|
--
|
|
2.6.6
|
|
|