/[pkg-src]/trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxserver-magellan-2.patch |
Contents of /trunk/nxserver-freeedition/patches/nxserver-freeedition-4.0.181-nxserver-magellan-2.patch
Parent Directory | Revision Log
Revision 1767 -
(show annotations)
(download)
Tue May 8 11:11:05 2012 UTC (12 years, 4 months ago) by niro
File size: 26485 byte(s)
Tue May 8 11:11:05 2012 UTC (12 years, 4 months ago) by niro
File size: 26485 byte(s)
-reworked patches
1 | diff -Naur src-nxserver/NX/etc/server-magellan.cfg.sample src-nxserver-magellan/NX/etc/server-magellan.cfg.sample |
2 | --- src-nxserver/NX/etc/server-magellan.cfg.sample 1970-01-01 01:00:00.000000000 +0100 |
3 | +++ src-nxserver-magellan/NX/etc/server-magellan.cfg.sample 2012-05-08 14:03:16.978982523 +0200 |
4 | @@ -0,0 +1,769 @@ |
5 | +###################################################################### |
6 | +# # |
7 | +# Copyright (c) 2001, 2012 NoMachine, http://www.nomachine.com. # |
8 | +# # |
9 | +# All rights reserved. # |
10 | +# # |
11 | +###################################################################### |
12 | +# |
13 | +# based on server-debian.cfg.sample |
14 | +# |
15 | + |
16 | +# |
17 | +# Set config file format version. |
18 | +# |
19 | +ConfigFileVersion 4.0 |
20 | + |
21 | +# |
22 | +# Set the log level of NX Server. NX Server logs to the syslog all |
23 | +# the events that are <= to the level specified below, according to |
24 | +# the following convention: |
25 | +# |
26 | +# KERN_ERR 3: Error condition. |
27 | +# KERN_INFO 6: Informational. |
28 | +# KERN_DEBUG 7: Debug-level messages. |
29 | +# |
30 | +# Note that NX Server uses level 6 in the syslog to log the event. |
31 | +# This is intended to override settings on the local syslog configur- |
32 | +# ation that would prevent the event from being actually logged. |
33 | +# |
34 | +# The suggested values are: |
35 | +# |
36 | +# 6: This is the default value. Only the important events |
37 | +# are logged. |
38 | +# |
39 | +# 7: Sets logs to level debug. |
40 | +# |
41 | +#SessionLogLevel 6 |
42 | + |
43 | +# |
44 | +# Redirect NX Server to log to a custom file instead of logging to the |
45 | +# system log, usually the /var/log/messages file. |
46 | +# |
47 | +#SystemLogFile /tmp/NX.log |
48 | + |
49 | +# |
50 | +# Specify hostname for the NX Server. |
51 | +# |
52 | +#ServerName localhost.localdomain |
53 | + |
54 | +# |
55 | +# Specify the TCP port where the SSHD daemon is listening on the NX |
56 | +# Server host machine. |
57 | +# |
58 | +#SSHDPort 22 |
59 | + |
60 | +# |
61 | +# Set the base display number for NX sessions. |
62 | +# |
63 | +#DisplayBase 1001 |
64 | + |
65 | +# |
66 | +# Set the maximum number of displays reserved for NX sessions. |
67 | +# |
68 | +#DisplayLimit 200 |
69 | + |
70 | +# |
71 | +# Set the maximum number of concurrent NX sessions. |
72 | +# |
73 | +#SessionLimit 20 |
74 | + |
75 | +# |
76 | +# Specify the maximum number of concurrent NX sessions that can be run |
77 | +# by a single user. By default a user can run as many sessions as they |
78 | +# are allowed on the server. By setting this value to 1, the user has |
79 | +# to terminate their disconnected session before starting a new one. |
80 | +# |
81 | +#SessionUserLimit 20 |
82 | + |
83 | +# |
84 | +# Set for how long NX Server will retain data related to terminated |
85 | +# sessions in its session history. |
86 | +# |
87 | +# <0: Never delete data from NX session history. |
88 | +# |
89 | +# 0: Disable NX sessions history. |
90 | +# |
91 | +# >0: Keep data in session history for this amount |
92 | +# of seconds. |
93 | +# |
94 | +# The default value, 2592000 seconds, lets NX Server keep session data |
95 | +# for 30 days. |
96 | +# |
97 | +#SessionHistory 2592000 |
98 | + |
99 | +# |
100 | +# Allow NX Server to terminate oldest disconnected sessions: |
101 | +# |
102 | +# 1: Enabled. Enable the automatic kill of the disconnected |
103 | +# sessions. |
104 | +# |
105 | +# 0: Disabled. Disconnected sessions are never terminated. |
106 | +# |
107 | +# When this option is set and the maximum number of concurrent sessions |
108 | +# has been reached, the server will kill the oldest disconnected sessions to |
109 | +# make room for the new session. |
110 | +# |
111 | +#EnableAutokillSessions 0 |
112 | + |
113 | +# |
114 | +# Enable persistent sessions for users. If the option is followed by |
115 | +# the keyword 'all', all users are allowed to run persistent sessions. |
116 | +# Alternatively, it can be followed by a list of comma-separated user- |
117 | +# names. The default value is 'all' which corresponds to enabling |
118 | +# persistent sessions for all users. Values specified are overridden |
119 | +# by the value set for the 'DisablePersistentSession' key. |
120 | +# |
121 | +#EnablePersistentSession all |
122 | + |
123 | +# |
124 | +# Disable persistent sessions for users. If the option is followed by |
125 | +# the keyword 'all', no user is allowed to run persistent sessions. Al- |
126 | +# ternatively, the option can be followed by a list of comma-separated |
127 | +# usernames. The default value is the empty string which corresponds |
128 | +# to disabling persistent sessions for no user. The values specified |
129 | +# override the values set for the 'EnablePersistentSession' key. |
130 | +# |
131 | +#DisablePersistentSession "" |
132 | + |
133 | +# |
134 | +# Enable or disable SSH encryption of all traffic. |
135 | +# |
136 | +# 1: Enabled. Unencrypted connections between the proxies will |
137 | +# be allowed. |
138 | +# |
139 | +# 0: Disabled. Forbid the use of unencrypted connections. The |
140 | +# server will force the client to tunnel the proxy |
141 | +# connections over the encrypted channel. |
142 | +# |
143 | +# Session negotiation happens across an encrypted channel. The user |
144 | +# can specify if subsequent communication must take place through a |
145 | +# direct connection between the proxies or by tunneling it through SSH. |
146 | +# Uncomment the key and set the value to 0 to increase the security of |
147 | +# the host server or if NX Server is behind a firewall preventing the |
148 | +# access to the set of ports used by the NX Server. |
149 | +# |
150 | +# Unencrypted sessions require that the firewall lets the proxies |
151 | +# communicate over the TCP ports ranging from: |
152 | +# |
153 | +# DisplayBase + 4000 |
154 | +# |
155 | +# to: |
156 | +# |
157 | +# DisplayBase + 4000 + DisplayLimit |
158 | +# |
159 | +#EnableUnencryptedSession 1 |
160 | + |
161 | +# |
162 | +# Enable or disable clipboard: |
163 | +# |
164 | +# client: The content copied on the client can be pasted inside the |
165 | +# NX session. |
166 | +# |
167 | +# server: The content copied inside the NX session can be pasted |
168 | +# on the client. |
169 | +# |
170 | +# both: The copy&paste operations are allowed between both the |
171 | +# client and the NX session and viceversa. |
172 | +# |
173 | +# none: The copy&paste operations between the client and the NX |
174 | +# session are never allowed. |
175 | +# |
176 | +#EnableClipboard both |
177 | + |
178 | +# |
179 | +# Enable or disable NX users DB: |
180 | +# |
181 | +# 1: Enabled. Only users listed in NX users DB can login to the NX |
182 | +# server. |
183 | +# |
184 | +# 0: Disabled. All the authenticated users can login. |
185 | +# |
186 | +# If the NX user DB is disabled, any user providing a valid password |
187 | +# from local DB or through SSHD authentication, can connect to the NX |
188 | +# system. This is likely to be the default when SSHD authentication |
189 | +# with PAM is enabled. |
190 | +# |
191 | +#EnableUserDB 0 |
192 | + |
193 | +# |
194 | +# Enable or disable NX password DB: |
195 | +# |
196 | +# 1: Enabled. Use NX password DB to authenticate users. |
197 | +# |
198 | +# 0: Disabled. Use SSHD + PAM authentication. |
199 | +# |
200 | +# System administrators can enable a restricted set of users to con- |
201 | +# nect to NX Server by setting EnableUserDB to 1 and adding |
202 | +# those users to the DB. If user is enabled to connect, his/her pass- |
203 | +# word will be verified against the current PAM settings by the SSHD |
204 | +# daemon. |
205 | +# |
206 | +# If both 'EnableUserDB' and 'EnablePasswordDB' are set to 0, any |
207 | +# user being authenticated by SSHD account will be enabled to connect |
208 | +# to the system. |
209 | +# |
210 | +EnablePasswordDB 0 |
211 | + |
212 | +# |
213 | +# Specify hostname of the server used for NX SSH authentication. |
214 | +# |
215 | +#SSHDAuthServer 127.0.0.1 |
216 | + |
217 | +# |
218 | +# Specify the TCP port where the SSHD daemon is running on the NX SSH |
219 | +# authentication server. |
220 | +# |
221 | +#SSHDAuthPort 22 |
222 | + |
223 | +# |
224 | +# Enable or disable support for Kerberos tickets: |
225 | +# |
226 | +# 1: Enabled. NX Server will try to authenticate to the node by |
227 | +# using the Kerberos ticket. |
228 | +# |
229 | +# 0: Disabled. NX Server authenticates to the node by using |
230 | +# the nx key. |
231 | +# |
232 | +# Enabling this key has effect only when the client is trying to |
233 | +# log-in to the server by using the nx key. |
234 | +# |
235 | +#EnableGSSAPIAuthentication 0 |
236 | + |
237 | +# |
238 | +# Enable or disable statistics: |
239 | +# |
240 | +# 1: Enabled. Enable the production of NX statistics. |
241 | +# |
242 | +# 0: Disabled. Disable the production of NX statistics. |
243 | +# |
244 | +# Run the nxstat daemon in background. This daemon can be used to |
245 | +# produce statistics about the NX services and the node host machine |
246 | +# either for localhost and any of the available nodes when the load |
247 | +# balancing is enabled. This requires that the nxsensor daemon is |
248 | +# started on each of the node machines. |
249 | +# |
250 | +#EnableStatistics 0 |
251 | + |
252 | +# |
253 | +# Specify the port where the server will contact the nxsensor daemons |
254 | +# to collect the statistics. |
255 | +# |
256 | +#ServerSensorPort 19250 |
257 | + |
258 | +# |
259 | +# Enable or disable starting the NX httpd service: |
260 | +# |
261 | +# 1: Enabled. Enable starting of the NX httpd daemon. |
262 | +# |
263 | +# 0: Disabled. Disable starting of the NX httpd daemon. |
264 | +# |
265 | +#EnableHttpd 1 |
266 | + |
267 | +# |
268 | +# Enable or disable monitoring the NX Node host machines when multi- |
269 | +# node environment is supported. |
270 | +# |
271 | +# 1: Enabled. Enable starting of the NX Server daemon. |
272 | +# |
273 | +# 0: Disabled. Disable starting of the NX Server daemon. |
274 | +# |
275 | +#EnableNodeMonitoring 0 |
276 | + |
277 | +# |
278 | +# Set for how long the NX Server daemon has to wait for a reply from |
279 | +# the node machine before considering this host unreachable. The |
280 | +# default value is 10 seconds. |
281 | +# |
282 | +#NodeResponseTimeout 10 |
283 | + |
284 | +# |
285 | +# Specify a list of comma-separated 'hostname:port' values for XDM |
286 | +# server. |
287 | +# |
288 | +#RoundRobinXdmList localhost:177 |
289 | + |
290 | +# |
291 | +# Enable or disable the XDM round robin query: |
292 | +# |
293 | +# 1: Enabled. Let NX Server decide XDM host according to hostnames |
294 | +# that are defined in the RoundRobinXdmList key. |
295 | +# |
296 | +# 0: Disabled. |
297 | +# |
298 | +#EnableRoundRobinXdmQuery 1 |
299 | + |
300 | +# |
301 | +# Enable or disable the XDM indirect query: |
302 | +# |
303 | +# 1: Enabled. Let the user obtain a list of available XDM hosts. |
304 | +# |
305 | +# 0: Disabled. |
306 | +# |
307 | +#EnableIndirectXdmQuery 0 |
308 | + |
309 | +# |
310 | +# Enable or disable the XDM direct query: |
311 | +# |
312 | +# 1: Enabled. Let client specify XDM host. |
313 | +# |
314 | +# 0: Disabled. |
315 | +# |
316 | +#EnableDirectXdmQuery 0 |
317 | + |
318 | +# |
319 | +# Enable or disable the XDM broadcast query: |
320 | +# |
321 | +# 1: Enabled. Let client connect to the first responding XDM host. |
322 | +# |
323 | +# 0: Disabled. |
324 | +# |
325 | +#EnableBroadcastXdmQuery 0 |
326 | + |
327 | +# |
328 | +# Specify path and name of the command 'sessreg' for managing utmp and |
329 | +# wtmp entries for non-init clients. |
330 | +# |
331 | +#CommandSessreg /usr/X11/bin/sessreg |
332 | + |
333 | +# |
334 | +# Specify the location and name of the SSH authorized keys file. |
335 | +# |
336 | +SSHAuthorizedKeys authorized_keys |
337 | + |
338 | +# |
339 | +# Accept or refuse the client connection if SSHD does not export |
340 | +# the 'SSH_CONNECTION' and 'SSH_CLIENT' variables in the environment |
341 | +# passed to the NX Server. |
342 | +# |
343 | +# 1: Refuse. Check the remote IP and do not accept the connection if it |
344 | +# can't be determined. |
345 | +# |
346 | +# 0: Accept. Check the remote IP and accept the connection even if the |
347 | +# remote IP is not provided. |
348 | +# |
349 | +#SSHDCheckIP 0 |
350 | + |
351 | +# |
352 | +# Specify the base username to be used by NX Server to create guest |
353 | +# users accounts. The server will add a progressive number to the |
354 | +# name specified by GuestName, according to the range of values set |
355 | +# in the BaseGuestUserId and GuestUserIdLimit keys. |
356 | +# |
357 | +#GuestName guest |
358 | + |
359 | +# |
360 | +# Set the base User Identifier (UID) number for NX guest users. |
361 | +# |
362 | +#BaseGuestUserId 10 |
363 | + |
364 | +# |
365 | +# Set the maximum User Identifier (UID) number reserved for NX guest |
366 | +# users. |
367 | +# |
368 | +#GuestUserIdLimit 200 |
369 | + |
370 | +# |
371 | +# Set the Group Identifier (GID) for NX guest users. The specified |
372 | +# GID must already exist on the system. |
373 | +# |
374 | +#GuestUserGroup guest |
375 | + |
376 | +# |
377 | +# Set the maximum number of concurrent NX guest users. |
378 | +# |
379 | +#GuestUserLimit 10 |
380 | + |
381 | +# |
382 | +# Set the maximum number of NX sessions a NX guest user can run before |
383 | +# his/her account is terminated. |
384 | +# |
385 | +#GuestUserConnectionLimit 5 |
386 | + |
387 | +# |
388 | +# Set for how long NX Server has to retain NX guest users accounts. |
389 | +# |
390 | +# 0: NX guest users accounts are never removed. |
391 | +# |
392 | +# >0: Maintain NX guest users accounts for this amount |
393 | +# of seconds. |
394 | +# |
395 | +# The default value, 2592000 seconds, lets NX Server keep guest users |
396 | +# accounts for 30 days. |
397 | +# |
398 | +#GuestUserAccountExpiry 2592000 |
399 | + |
400 | +# |
401 | +# Set for how long NX Server has to keep alive a NX guest user's |
402 | +# session. When the time has expired, NX Server will kill the session. |
403 | +# |
404 | +# 0: NX guest user session is never terminated. |
405 | +# |
406 | +# >0: Keep NX guest user session live for this number |
407 | +# of seconds. |
408 | +# |
409 | +#GuestConnectionExpiry 0 |
410 | + |
411 | +# |
412 | +# Enable or disable possibility for NX guest users to disconnect their |
413 | +# sessions: |
414 | +# |
415 | +# 1: Enabled. NX Server lets NX guest users disconnect sessions. |
416 | +# |
417 | +# 0: Disabled. |
418 | +# |
419 | +#GuestUserAllowDisconnect 1 |
420 | + |
421 | +# |
422 | +# Set the home directory for NX guest users. Provide an empty value |
423 | +# between double quotes to let NX Server create the guest user's home |
424 | +# in the default directory set on the system. |
425 | +# |
426 | +#GuestUserHome /home |
427 | + |
428 | +# |
429 | +# Enable or disable removing the NX guest user from the system when the |
430 | +# account is expired: |
431 | +# |
432 | +# 1: Enabled. When the guest account is expired, NX Server will |
433 | +# delete the account from both the system and the NX guests DB |
434 | +# and will remove the home directory. |
435 | +# |
436 | +# 0: Disabled. When the guest account is expired, NX Server will |
437 | +# keep the guest account on the system but will forbid this user |
438 | +# to start new sessions on the server. |
439 | +# |
440 | +#EnableGuestWipeout 1 |
441 | + |
442 | +# |
443 | +# Allow the server to set disk quota for the NX guest accounts: |
444 | +# |
445 | +# 1: Enabled. When a new guest account is created on the system, |
446 | +# the server will set the disk quota for this user. |
447 | +# |
448 | +# 0: Disabled. No restrictions on the amount of disk space used |
449 | +# by each guest user are applied. |
450 | +# |
451 | +#EnableGuestQuota 0 |
452 | + |
453 | +# |
454 | +# Specify the username of the account to be used as a protoype for |
455 | +# propagating its disk quota settings to all the new guest accounts. |
456 | +# If the softlimit or the hardlimit on either the inode or the disk |
457 | +# block are set, they will override the settings applied to the user |
458 | +# prototype. |
459 | +# |
460 | +#GuestQuotaProtoname protoguest |
461 | + |
462 | +# |
463 | +# Specify the maximum amount of disk space available for each of the |
464 | +# guest users, checked as number of inodes. This limit can be exceeded |
465 | +# for the grace period. |
466 | +# |
467 | +#GuestQuotaInodeSoftlimit 0 |
468 | + |
469 | +# |
470 | +# Specify the absolute maximum amount of disk space available for |
471 | +# each of the guest users, checked as number of inodes. Once this |
472 | +# limit is reached, no further disk space can be used. |
473 | +# |
474 | +#GuestQuotaInodeHardlimit 0 |
475 | + |
476 | +# |
477 | +# Specify the maximum amount of disk space available for each of the |
478 | +# guest users, checked as number of disk blocks consumed. This limit |
479 | +# can be exceeded for the grace period. |
480 | +# |
481 | +#GuestQuotaBlockSoftlimit 0 |
482 | + |
483 | +# |
484 | +# Specify the absolute maximum amount of disk space available for each |
485 | +# of the guest users, checked as number of disk blocks consumed. Once |
486 | +# this limit is reached, no further disk space can be used. |
487 | +# |
488 | +#GuestQuotaBlockHardlimit 0 |
489 | + |
490 | +# |
491 | +# Specify the grace period, expressed in seconds, during which the |
492 | +# soft limit, set in the GuestQuotaInodeSoftlimit key may be |
493 | +# exceeded. |
494 | +# |
495 | +#GuestQuotaInodeGracePeriod 0 |
496 | + |
497 | +# |
498 | +# Specify the grace period, expressed in seconds, during which the |
499 | +# soft limit, set in the GuestQuotaBlockSoftlimit key may be |
500 | +# exceeded. |
501 | +# |
502 | +#GuestQuotaBlockGracePeriod 0 |
503 | + |
504 | +# |
505 | +# Specify a list of comma-separated filesystem names or devices to |
506 | +# which the disk quota restrictions will be applied. The default |
507 | +# value is 'all' which corresponds to applying the disk quota limits |
508 | +# to all the filesystems having disk quota enabled. |
509 | +# |
510 | +#GuestQuotaFilesystems all |
511 | + |
512 | +# |
513 | +# Set the User Identifier (UID) number for NX users. If an empty value |
514 | +# is specified, the NX Server will create the account with the default |
515 | +# value set on the system. |
516 | +# |
517 | +#UserId 10 |
518 | + |
519 | +# |
520 | +# Set the Group Identifier (GID) for NX users. If an empty value is |
521 | +# specified, NX Server will create the account with the default |
522 | +# value set on the system. |
523 | +# |
524 | +#UserGroup users |
525 | + |
526 | +# |
527 | +# Set the home directory for NX users. If an empty value is specified, |
528 | +# NX Server will create the user's home in the default directory |
529 | +# set on the system. |
530 | +# |
531 | +#UserHome /home |
532 | + |
533 | +# |
534 | +# Allow the user to connect to a virtual desktop: |
535 | +# |
536 | +# 1: Enabled. Each user can request to connect to a |
537 | +# virtual desktop. |
538 | +# |
539 | +# 0: Disabled. Connections to a virtual desktop are |
540 | +# forbidden. |
541 | +# |
542 | +#VirtualDesktopSharing 1 |
543 | + |
544 | +# |
545 | +# Set the interaction level for the session connected to a virtual |
546 | +# desktop: |
547 | +# |
548 | +# 0: View-only. The session is connected to the desktop in |
549 | +# view-only mode, i.e. the user can't interact with the |
550 | +# virtual desktop. |
551 | +# |
552 | +# 1: Restricted. User connected to the virtual desktop can |
553 | +# interact with the desktop except for resize operations. |
554 | +# |
555 | +# 2: Interactive. User connected to the virtual desktop has |
556 | +# full interaction with the desktop. |
557 | +# |
558 | +#VirtualDesktopMode 2 |
559 | + |
560 | +# |
561 | +# Enable or disable NX Server requesting authorization to the owner of |
562 | +# the virtual desktop before connecting. |
563 | +# |
564 | +# 1: Enabled. NX Server asks for authorization to the owner |
565 | +# of the virtual desktop before trying to connect. |
566 | +# |
567 | +# 0: Disabled. NX Server tries to connect to the virtual |
568 | +# desktop without the need for any authorization from the |
569 | +# desktop's owner. |
570 | +# |
571 | +#VirtualDesktopAuthorization 0 |
572 | + |
573 | +# |
574 | +# Allow the user to connect to the physical desktop: |
575 | +# |
576 | +# 1: Enabled. Each user can request to connect to the |
577 | +# physical desktop. |
578 | +# |
579 | +# 0: Disabled. Connections to the physical desktop are |
580 | +# forbidden. |
581 | +# |
582 | +#PhysicalDesktopSharing 1 |
583 | + |
584 | +# |
585 | +# Set the interaction level for the session connected to the physical |
586 | +# desktop: |
587 | +# |
588 | +# 0: View-only. The session is connected to the desktop in |
589 | +# view-only mode, i.e. the user can't interact with the |
590 | +# physical desktop. |
591 | +# |
592 | +# 1: Interactive. User connected to the physical desktop has |
593 | +# full interaction with the desktop. |
594 | +# |
595 | +#PhysicalDesktopMode 1 |
596 | + |
597 | +# |
598 | +# Enable or disable NX Server requesting authorization to the owner of |
599 | +# the physical desktop before connecting. |
600 | +# |
601 | +# 1: Enabled. NX Server asks for authorization to the owner |
602 | +# of the physical desktop before trying to connect. |
603 | +# |
604 | +# 0: Disabled. NX Server tries to connect to the physical |
605 | +# desktop without the need for any authorization from the |
606 | +# desktop's owner. |
607 | +# |
608 | +#PhysicalDesktopAuthorization 0 |
609 | + |
610 | +# |
611 | +# Specify absolute path of the custom script to be executed before |
612 | +# the user logs in. The script can accept remote IP of the user's |
613 | +# machine as its input. |
614 | +# |
615 | +# E.g. UserScriptBeforeLogin /tmp/nxscript/script.sh |
616 | +# |
617 | +#UserScriptBeforeLogin "" |
618 | + |
619 | +# |
620 | +# Specify absolute path of the custom script to be executed after |
621 | +# the user logs in. The script can accept username as its input. |
622 | +# |
623 | +#UserScriptAfterLogin "" |
624 | + |
625 | +# |
626 | +# Specify absolute path of the custom script to be executed before |
627 | +# the session start-up. The script can accept session ID, username, |
628 | +# node host and node port as its input. |
629 | +# |
630 | +#UserScriptBeforeSessionStart "" |
631 | + |
632 | +# |
633 | +# Specify absolute path of the custom script to be executed after the |
634 | +# session start-up. The script can accept session ID, username, node |
635 | +# host and node port as its input. |
636 | +# |
637 | +#UserScriptAfterSessionStart "" |
638 | + |
639 | +# |
640 | +# Specify absolute path of the custom script to be executed before |
641 | +# the session is closed. The script can accept session ID, username, |
642 | +# node host and node port as its input. |
643 | +# |
644 | +#UserScriptBeforeSessionClose "" |
645 | + |
646 | +# |
647 | +# Specify absolute path of the custom script to be executed after the |
648 | +# session is closed. The script can accept session ID, username, node |
649 | +# host and node port as its input. |
650 | +# |
651 | +#UserScriptAfterSessionClose "" |
652 | + |
653 | +# |
654 | +# Specify absolute path of the custom script to be executed before |
655 | +# the session is reconnected. The script can accept session ID user- |
656 | +# name, node host and node port as its input. |
657 | +# |
658 | +#UserScriptBeforeSessionReconnect "" |
659 | + |
660 | +# |
661 | +# Specify absolute path of the custom script to be executed after the |
662 | +# session is reconnected. The script can accept session ID username |
663 | +# node host and node port as its input. |
664 | +# |
665 | +#UserScriptAfterSessionReconnect "" |
666 | + |
667 | +# |
668 | +# Specify absolute path of the custom script to be executed before |
669 | +# the session is disconnected. The script can accept session ID, user- |
670 | +# name, node host and node port as its input. |
671 | +# |
672 | +#UserScriptBeforeSessionDisconnect "" |
673 | + |
674 | +# |
675 | +# Specify absolute path of the custom script to be executed after |
676 | +# the session is disconnected. The script can accept session ID, user- |
677 | +# name, node host and node port as its input. |
678 | +# |
679 | +#UserScriptAfterSessionDisconnect "" |
680 | + |
681 | +# |
682 | +# Specify absolute path of the custom script to be executed before |
683 | +# session failure. The script can accept session ID username, node |
684 | +# host and node port as its input. |
685 | +# |
686 | +#UserScriptBeforeSessionFailure "" |
687 | + |
688 | +# |
689 | +# Specify absolute path of the custom script to be executed after |
690 | +# session failure. The script can accept session ID username, node |
691 | +# host and node port as its input. |
692 | +# |
693 | +#UserScriptAfterSessionFailure "" |
694 | + |
695 | +# |
696 | +# Specify absolute path of the custom script to be executed before |
697 | +# NX Server creates the new account. The script can accept username |
698 | +# as its input. |
699 | +# |
700 | +#UserScriptBeforeCreateUser "" |
701 | + |
702 | +# |
703 | +# Specify absolute path of the custom script to be executed after |
704 | +# NX Server has created the new account. The script can accept user- |
705 | +# name as its input. |
706 | +# |
707 | +#UserScriptAfterCreateUser "" |
708 | + |
709 | +# |
710 | +# Specify absolute path of the custom script to be executed before |
711 | +# NX Server removes the account. The script can accept username as |
712 | +# its input. |
713 | +# |
714 | +#UserScriptBeforeDeleteUser "" |
715 | + |
716 | +# |
717 | +# Specify absolute path of the custom script to be executed after |
718 | +# NX Server has removed the account. The script can accept username |
719 | +# as its input. |
720 | +# |
721 | +#UserScriptAfterDeleteUser "" |
722 | + |
723 | +# |
724 | +# Specify absolute path of the custom script to be executed before |
725 | +# NX Server disables the user. The script can accept username as its |
726 | +# input. |
727 | +# |
728 | +#UserScriptBeforeDisableUser "" |
729 | + |
730 | +# |
731 | +# Specify absolute path of the custom script to be executed after |
732 | +# NX Server has disabled the user. The script can accept username |
733 | +# as its input. |
734 | +# |
735 | +#UserScriptAfterDisableUser "" |
736 | + |
737 | +# |
738 | +# Specify absolute path of the custom script to be executed before |
739 | +# NX Server enables the user. The script can accept username as its |
740 | +# input. |
741 | +# |
742 | +#UserScriptBeforeEnableUser "" |
743 | + |
744 | +# |
745 | +# Specify absolute path of the custom script to be executed after |
746 | +# NX Server has enabled the user. The script can accept username |
747 | +# as its input. |
748 | +# |
749 | +#UserScriptAfterEnableUser "" |
750 | + |
751 | +# |
752 | +# Allow the root user (or Administrator on a Windows machine) to |
753 | +# run NX sessions. |
754 | +# |
755 | +# 1: Enabled. Allow an NX user to run sessions as user with |
756 | +# administrative rights. |
757 | +# |
758 | +# 0: Disabled. NX Server forbids an NX user to log in as user |
759 | +# having administrative privileges. |
760 | +# |
761 | +#EnableAdministratorLogin 0 |
762 | + |
763 | +# |
764 | +# Specify path to the SSH client. |
765 | +# |
766 | +#SSHClient /usr/bin/ssh |
767 | + |
768 | +# |
769 | +# Specify a list of comma-separated session types available on this |
770 | +# server. |
771 | +# |
772 | +#AvailableSessionTypes "" |
773 | + |
774 | diff -Naur src-nxserver/NX/scripts/etc/nxserver src-nxserver-magellan/NX/scripts/etc/nxserver |
775 | --- src-nxserver/NX/scripts/etc/nxserver 2012-03-09 17:26:44.000000000 +0100 |
776 | +++ src-nxserver-magellan/NX/scripts/etc/nxserver 2012-05-08 13:54:24.873982523 +0200 |
777 | @@ -19,6 +19,9 @@ |
778 | elif [ -x /usr/bin/awk ] |
779 | then |
780 | COMMAND_AWK="/usr/bin/awk" |
781 | +elif [ -x /bin/awk ] |
782 | +then |
783 | + COMMAND_AWK="/bin/awk" |
784 | else |
785 | COMMAND_AWK="awk" |
786 | fi |
787 | diff -Naur src-nxserver/NX/scripts/setup/nxserver src-nxserver-magellan/NX/scripts/setup/nxserver |
788 | --- src-nxserver/NX/scripts/setup/nxserver 2012-04-20 11:05:53.000000000 +0200 |
789 | +++ src-nxserver-magellan/NX/scripts/setup/nxserver 2012-05-08 14:04:02.636982523 +0200 |
790 | @@ -85,6 +85,13 @@ |
791 | { |
792 | ret_getLinuxName=0 |
793 | |
794 | + # prefer os-release |
795 | + if [ -f /etc/os-release ]; |
796 | + then |
797 | + system=$(source /etc/os-release; echo "${ID}") |
798 | + return 0 |
799 | + fi |
800 | + |
801 | if [ -f /etc/SuSE-release ]; |
802 | then |
803 | system=suse |
804 | @@ -109,6 +116,12 @@ |
805 | return 0 |
806 | fi |
807 | |
808 | + if [ -f /etc/mageversion ]; |
809 | + then |
810 | + system=magellan |
811 | + return 0 |
812 | + fi |
813 | + |
814 | if [ -f /etc/debian_version ]; |
815 | then |
816 | system=debian |
817 | @@ -179,6 +192,9 @@ |
818 | if [ -x "/bin/unlink" ]; |
819 | then |
820 | UNLINKCOMMAND="/bin/unlink" |
821 | +elif [ -x "/usr/bin/unlink" ]; |
822 | +then |
823 | + UNLINKCOMMAND="/usr/bin/unlink" |
824 | elif [ -x "/usr/sbin/unlink" ]; |
825 | then |
826 | UNLINKCOMMAND="/usr/sbin/unlink" |
827 | @@ -236,6 +252,9 @@ |
828 | if [ -x "/usr/bin/awk" ]; |
829 | then |
830 | AWKCOMMAND="/usr/bin/awk" |
831 | + elif [ -x "/bin/awk" ]; |
832 | + then |
833 | + AWKCOMMAND="/bin/awk" |
834 | else |
835 | AWKCOMMAND="awk" |
836 | fi |
837 | @@ -293,7 +312,7 @@ |
838 | SEDCOMMAND="sed" |
839 | fi |
840 | else |
841 | - if [ -x "/bin/grep" ]; |
842 | + if [ -x "/bin/sed" ]; |
843 | then |
844 | SEDCOMMAND="/bin/sed" |
845 | else |
846 | @@ -480,6 +499,9 @@ |
847 | if [ -x "/sbin/pidof" ]; |
848 | then |
849 | PIDOFCOMMAND="/sbin/pidof" |
850 | +elif [ -x "/bin/pidof" ]; |
851 | +then |
852 | + PIDOFCOMMAND="/bin/pidof" |
853 | else |
854 | PIDOFCOMMAND="pidof" |
855 | fi |
856 | @@ -2061,6 +2083,7 @@ |
857 | ${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." |
858 | ${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." |
859 | ${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." |
860 | + ${ECHOCOMMAND} " magellan Magellan-Linux 0.8.x/0.9.x/0.10.x/R.11 etc." |
861 | } |
862 | |
863 | updatePathsInFile () |
864 | @@ -3001,6 +3024,9 @@ |
865 | elif [ "$system" = "fedora" ]; |
866 | then |
867 | detectedSystem="Fedora" |
868 | + elif [ "$system" = "magellan" ]; |
869 | + then |
870 | + detectedSystem="Magellan-Linux" |
871 | elif [ "$system" = "debian" ]; |
872 | then |
873 | detectedSystem="Debian" |
874 | @@ -3390,6 +3416,7 @@ |
875 | "suse" ) ;; |
876 | "mandriva" ) ;; |
877 | "fedora" ) ;; |
878 | + "magellan" ) ;; |
879 | "debian" ) ;; |
880 | "solaris" ) ;; |
881 | "macosx" ) ;; |
882 | @@ -3530,6 +3557,7 @@ |
883 | /etc/debian_version |
884 | /etc/debian_release |
885 | /etc/fedora-release |
886 | +/etc/mageversion |
887 | /etc/gentoo-release |
888 | /etc/immunix-release |
889 | knoppix_version |
890 | @@ -3559,6 +3587,7 @@ |
891 | /etc/va-release |
892 | /etc/yellowdog-release |
893 | /etc/system-release |
894 | +/etc/os-release |
895 | ) |
896 | |
897 | getVersionFromLSB() |
898 | @@ -4496,7 +4525,7 @@ |
899 | |
900 | LICENSE_FILE="${NX_ROOT}/etc/server.lic" |
901 | NODE_LICENSE_FILE="${NX_ROOT}/etc/node.lic" |
902 | - FILE_AUTHORIZED_KEYS="${NXHOME}/.ssh/authorized_keys2" |
903 | + FILE_AUTHORIZED_KEYS="${NXHOME}/.ssh/authorized_keys" |
904 | |
905 | |
906 | WRAPPER="${NX_ROOT}/bin/nxexec" |
907 | @@ -5007,6 +5036,12 @@ |
908 | |
909 | removeNXinit () { |
910 | |
911 | + # do nothing on magellan |
912 | + if [ "$system" = "magellan" ]; |
913 | + then |
914 | + return |
915 | + fi |
916 | + |
917 | if [ "${system}" = "fedora" ] || [ "${system}" = "redhat" ] || [ "${system}" = "suse" ]; |
918 | then |
919 | if [ -f "/sbin/chkconfig" ]; |
920 | @@ -5215,6 +5250,12 @@ |
921 | |
922 | addNXinit () { |
923 | |
924 | + # do nothing on magellan |
925 | + if [ "$system" = "magellan" ]; |
926 | + then |
927 | + return |
928 | + fi |
929 | + |
930 | if [ "${system}" = "macosx" ]; |
931 | then |
932 | return 0 |
933 | @@ -7656,6 +7697,7 @@ |
934 | /etc/server-fedora.cfg.sample |
935 | /etc/server-mandriva.cfg.sample |
936 | /etc/server-redhat.cfg.sample |
937 | +/etc/server-magellan.cfg.sample |
938 | /etc/server-suse.cfg.sample |
939 | /etc/server-solaris.cfg.sample |
940 | /etc/server-macosx.cfg.sample |
941 | @@ -8707,6 +8749,12 @@ |
942 | |
943 | addNxhttpdUserLinux () { |
944 | |
945 | + # simply abort if the user exist. on magellan this user is already created. |
946 | + if id nxhttpd > /dev/null 2>&1 |
947 | + then |
948 | + return |
949 | + fi |
950 | + |
951 | checkNxhttpdGroupExist |
952 | if [ "x${ret_checkNxhttpdGroupExist}" = "x0" ]; |
953 | then |