From cb1960e0fc3aa4bb2cd2809508e8899f18c196ae Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Mon, 14 Nov 2016 18:23:12 +0900 Subject: [PATCH] config: use semicolon to comment out descriptions in config files and use number sign to comment out actual configurations. For example: ; if set to true, enables foobar #foobar=true --- sesman/sesman.ini | 62 ++++++++++++------------- xrdp/xrdp.ini | 96 +++++++++++++++++++-------------------- xrdp/xrdp_keyboard.ini | 100 ++++++++++++++++++++--------------------- 3 files changed, 129 insertions(+), 129 deletions(-) diff --git a/sesman/sesman.ini b/sesman/sesman.ini index 98996a08..d1f18d9e 100644 --- a/sesman/sesman.ini +++ b/sesman/sesman.ini @@ -10,49 +10,49 @@ AllowRootLogin=true MaxLoginRetry=4 TerminalServerUsers=tsusers TerminalServerAdmins=tsadmins -# When AlwaysGroupCheck = false access will be permitted -# if the group TerminalServerUsers is not defined. +; When AlwaysGroupCheck=false access will be permitted +; if the group TerminalServerUsers is not defined. AlwaysGroupCheck=false [Sessions] -## X11DisplayOffset - x11 display number offset -# Type: integer -# Default: 10 +;; X11DisplayOffset - x11 display number offset +; Type: integer +; Default: 10 X11DisplayOffset=10 -## MaxSessions - maximum number of connections to an xrdp server -# Type: integer -# Default: 0 +;; MaxSessions - maximum number of connections to an xrdp server +; Type: integer +; Default: 0 MaxSessions=50 -## KillDisconnected - kill disconnected sessions -# Type: boolean -# Default: false -# if 1, true, or yes, kill session after 60 seconds +;; KillDisconnected - kill disconnected sessions +; Type: boolean +; Default: false +; if 1, true, or yes, kill session after 60 seconds KillDisconnected=false -## IdleTimeLimit - when to disconnect idle sessions -# Type: integer -# Default: 0 -# if not zero, the seconds without mouse or keyboard input before disconnect -# not complete yet +;; IdleTimeLimit - when to disconnect idle sessions +; Type: integer +; Default: 0 +; if not zero, the seconds without mouse or keyboard input before disconnect +; not complete yet IdleTimeLimit=0 -## DisconnectedTimeLimit - when to kill idle sessions -# Type: integer -# Default: 0 -# if not zero, the seconds before a disconnected session is killed -# min 60 seconds +;; DisconnectedTimeLimit - when to kill idle sessions +; Type: integer +; Default: 0 +; if not zero, the seconds before a disconnected session is killed +; min 60 seconds DisconnectedTimeLimit=0 -## Policy - session allocation policy -# Type: enum [ "Default" | "UBD" | "UBI" | "UBC" | "UBDI" | "UBDC" ] -# Default: Xrdp: and Xvnc: -# "UBD" session per -# "UBI" session per -# "UBC" session per -# "UBDI" session per -# "UBDC" session per +;; Policy - session allocation policy +; Type: enum [ "Default" | "UBD" | "UBI" | "UBC" | "UBDI" | "UBDC" ] +; Default: Xrdp: and Xvnc: +; "UBD" session per +; "UBI" session per +; "UBC" session per +; "UBDI" session per +; "UBDC" session per Policy=Default [Logging] @@ -91,7 +91,7 @@ param=-logfile param=/dev/null [Chansrv] -# drive redirection, defaults to xrdp_client if not set +; drive redirection, defaults to xrdp_client if not set FuseMountName=thinclient_drives [SessionVariables] diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini index 53a96214..9541257d 100644 --- a/xrdp/xrdp.ini +++ b/xrdp/xrdp.ini @@ -1,5 +1,5 @@ [Globals] -# xrdp.ini file version number +; xrdp.ini file version number ini_version=1 bitmap_cache=true @@ -8,35 +8,35 @@ port=3389 allow_channels=true max_bpp=32 fork=true -# minimum security level allowed for client -# can be 'none', 'low', 'medium', 'high', 'fips' +; minimum security level allowed for client +; can be 'none', 'low', 'medium', 'high', 'fips' crypt_level=high -# security layer can be 'tls', 'rdp' or 'negotiate' -# for client compatible layer +; security layer can be 'tls', 'rdp' or 'negotiate' +; for client compatible layer security_layer=negotiate -# X.509 certificate and private key -# openssl req -x509 -newkey rsa:2048 -nodes -keyout key.pem -out cert.pem -days 365 +; X.509 certificate and private key +; openssl req -x509 -newkey rsa:2048 -nodes -keyout key.pem -out cert.pem -days 365 certificate= key_file= -# disable SSlv3 +; disable SSlv3 #disableSSLv3=true -# set TLS cipher suites +; set TLS cipher suites #tls_ciphers=HIGH -# regulate if the listening socket use socket option tcp_nodelay -# no buffering will be performed in the TCP stack +; regulate if the listening socket use socket option tcp_nodelay +; no buffering will be performed in the TCP stack tcp_nodelay=true -# regulate if the listening socket use socket option keepalive -# if the network connection disappear without close messages the connection will be closed +; regulate if the listening socket use socket option keepalive +; if the network connection disappear without close messages the connection will be closed tcp_keepalive=true #tcp_send_buffer_bytes=32768 #tcp_recv_buffer_bytes=32768 -# -# colors used by windows in RGB format -# +; +; colors used by windows in RGB format +; blue=009cb5 grey=dedede @@ -51,66 +51,66 @@ grey=dedede #hidelogwindow=true -# when true, userid/password *must* be passed on cmd line +; when true, userid/password *must* be passed on cmd line # require_credentials=true -# Section name to use for automatic login if the client sends username -# and password +; Section name to use for automatic login if the client sends username +; and password autorun=X11rdp bulk_compression=true -# You can set the PAM error text in a gateway setup (MAX 256 chars) +; You can set the PAM error text in a gateway setup (MAX 256 chars) #pamerrortxt=change your password according to policy at http://url new_cursors=true allow_multimon=true -# fastpath - can be set to input / output / both / none +; fastpath - can be set to input / output / both / none use_fastpath=both -# -# configure login screen -# +; +; configure login screen +; -# Login Screen Window Title +; Login Screen Window Title #ls_title=My Login Title -# top level window background color in RGB format +; top level window background color in RGB format ls_top_window_bg_color=009cb5 -# width and height of login screen +; width and height of login screen ls_width=350 ls_height=430 -# login screen background color in RGB format +; login screen background color in RGB format ls_bg_color=dedede -# optional background image filename (bmp format). +; optional background image filename (bmp format). #ls_background_image= -# logo -# full path to bmp-file or file in shared folder +; logo +; full path to bmp-file or file in shared folder ls_logo_filename= ls_logo_x_pos=55 ls_logo_y_pos=50 -# for positioning labels such as username, password etc +; for positioning labels such as username, password etc ls_label_x_pos=30 ls_label_width=60 -# for positioning text and combo boxes next to above labels +; for positioning text and combo boxes next to above labels ls_input_x_pos=110 ls_input_width=210 -# y pos for first label and combo box +; y pos for first label and combo box ls_input_y_pos=220 -# OK button +; OK button ls_btn_ok_x_pos=142 ls_btn_ok_y_pos=370 ls_btn_ok_width=85 ls_btn_ok_height=30 -# Cancel button +; Cancel button ls_btn_cancel_x_pos=237 ls_btn_cancel_y_pos=370 ls_btn_cancel_width=85 @@ -121,15 +121,15 @@ LogFile=xrdp.log LogLevel=DEBUG EnableSyslog=true SyslogLevel=DEBUG -# LogLevel and SysLogLevel could by any of: core, error, warning, info or debug +; LogLevel and SysLogLevel could by any of: core, error, warning, info or debug [Channels] -# Channel names not listed here will be blocked by XRDP. -# You can block any channel by setting its value to false. -# IMPORTANT! All channels are not supported in all use -# cases even if you set all values to true. -# You can override these settings on each session type -# These settings are only used if allow_channels=true +; Channel names not listed here will be blocked by XRDP. +; You can block any channel by setting its value to false. +; IMPORTANT! All channels are not supported in all use +; cases even if you set all values to true. +; You can override these settings on each session type +; These settings are only used if allow_channels=true rdpdr=true rdpsnd=true drdynvc=true @@ -138,11 +138,11 @@ rail=true xrdpvr=true tcutils=true -# for debugging xrdp, in section xrdp1, change port=-1 to this: -# port=/tmp/.xrdp/xrdp_display_10 +; for debugging xrdp, in section xrdp1, change port=-1 to this: +#port=/tmp/.xrdp/xrdp_display_10 -# for debugging xrdp, add following line to section xrdp1 -# chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210 +; for debugging xrdp, add following line to section xrdp1 +#chansrvport=/tmp/.xrdp/xrdp_chansrv_socket_7210 [X11rdp] name=X11rdp @@ -217,7 +217,7 @@ port=ask3389 username=ask password=ask -# You can override the common channel settings for each session type +; You can override the common channel settings for each session type #channel.rdpdr=true #channel.rdpsnd=true #channel.drdynvc=true diff --git a/xrdp/xrdp_keyboard.ini b/xrdp/xrdp_keyboard.ini index 21e27f1c..e185c76d 100644 --- a/xrdp/xrdp_keyboard.ini +++ b/xrdp/xrdp_keyboard.ini @@ -1,59 +1,59 @@ -# -# RDP Keyboard <-> X11 Keyboard layout map -# -# How this file works: -# 1. load the file and scan each section to find matching "keyboard_type" -# and "keyboard_subtype" based on the values received from the client. -# If not found, then jump to default section. -# 2. in the selected section, look for "rdp_layouts" and "layouts_map". -# Based on the "keylayout" value from the client, find the right x11 -# layout value. -# 3. model/variant are inferred based on the "keyboard_type" and -# "keyboard_subtype", but they can be overridden. -# +; +; RDP Keyboard <-> X11 Keyboard layout map +; +; How this file works: +; 1. load the file and scan each section to find matching "keyboard_type" +; and "keyboard_subtype" based on the values received from the client. +; If not found, then jump to default section. +; 2. in the selected section, look for "rdp_layouts" and "layouts_map". +; Based on the "keylayout" value from the client, find the right x11 +; layout value. +; 3. model/variant are inferred based on the "keyboard_type" and +; "keyboard_subtype", but they can be overridden. +; -# -# RDP Keyboard Type (http://msdn.microsoft.com/en-us/library/cc240563.aspx) -# -# 0 is not a valid value -# -# 1 - IBM PC/XT or compatible (83-key) keyboard -# 2 - Olivetti "ICO" (102-key) keyboard -# 3 - IBM PC/AT (84-key) or similar keyboard -# 4 - IBM enhanced (101- or 102-key) keyboard -# 5 - Nokia 1050 and similar keyboards -# 6 - Nokia 9140 and similar keyboards -# 7 - Japanese keyboard -# -# RDP Keyboard Subtype is vendor dependent. XRDP defines as follows: -# -# 0 is not a valid value -# -# 1 - Standard -# 2 - FreeRDP JP keyboard -# 3 - Macintosh -# ... - < any vendor dependent subtype > -# -# The list can be augmented. -# +; +; RDP Keyboard Type (http://msdn.microsoft.com/en-us/library/cc240563.aspx) +; +; 0 is not a valid value +; +; 1 - IBM PC/XT or compatible (83-key) keyboard +; 2 - Olivetti "ICO" (102-key) keyboard +; 3 - IBM PC/AT (84-key) or similar keyboard +; 4 - IBM enhanced (101- or 102-key) keyboard +; 5 - Nokia 1050 and similar keyboards +; 6 - Nokia 9140 and similar keyboards +; 7 - Japanese keyboard +; +; RDP Keyboard Subtype is vendor dependent. XRDP defines as follows: +; +; 0 is not a valid value +; +; 1 - Standard +; 2 - FreeRDP JP keyboard +; 3 - Macintosh +; ... - < any vendor dependent subtype > +; +; The list can be augmented. +; -# default +; default [default] -# keyboard_type and keyboard_subtype is not read for default section. It -# is only a placeholder to keep consistency. Default model/variant are -# platform dependent, and could be overridden if needed. +; keyboard_type and keyboard_subtype is not read for default section. It +; is only a placeholder to keep consistency. Default model/variant are +; platform dependent, and could be overridden if needed. keyboard_type=0 keyboard_subtype=0 -# user could override variant and model, but generally they should be inferred -# automatically based on keyboard type and subtype -#variant= -#model= +; user could override variant and model, but generally they should be inferred +; automatically based on keyboard type and subtype +;variant= +;model= -# A list of supported RDP keyboard layouts +; A list of supported RDP keyboard layouts rdp_layouts=default_rdp_layouts -# The map from RDP keyboard layout to X11 keyboard layout +; The map from RDP keyboard layout to X11 keyboard layout layouts_map=default_layouts_map [default_rdp_layouts] @@ -72,7 +72,7 @@ rdp_layout_pt=0x00000816 rdp_layout_br=0x00000416 rdp_layout_pl=0x00000415 -# = +; = [default_layouts_map] rdp_layout_us=us rdp_layout_de=de @@ -89,8 +89,8 @@ rdp_layout_pt=pt rdp_layout_br=br(abnt2) rdp_layout_pl=pl -# if two sections have the same keyboard_type and keyboard_subtype, then -# the latter could override the former. +; if two sections have the same keyboard_type and keyboard_subtype, then +; the latter could override the former. [rdp_keyboard_mac] keyboard_type=4 keyboard_subtype=3