diff -Naur src-nxserver/NX/etc/server-magellan.cfg.sample src-nxserver-magellan/NX/etc/server-magellan.cfg.sample --- src-nxserver/NX/etc/server-magellan.cfg.sample 1970-01-01 01:00:00.000000000 +0100 +++ src-nxserver-magellan/NX/etc/server-magellan.cfg.sample 2012-05-08 14:03:16.978982523 +0200 @@ -0,0 +1,769 @@ +###################################################################### +# # +# Copyright (c) 2001, 2012 NoMachine, http://www.nomachine.com. # +# # +# All rights reserved. # +# # +###################################################################### +# +# based on server-debian.cfg.sample +# + +# +# Set config file format version. +# +ConfigFileVersion 4.0 + +# +# Set the log level of NX Server. NX Server logs to the syslog all +# the events that are <= to the level specified below, according to +# the following convention: +# +# KERN_ERR 3: Error condition. +# KERN_INFO 6: Informational. +# KERN_DEBUG 7: Debug-level messages. +# +# Note that NX Server uses level 6 in the syslog to log the event. +# This is intended to override settings on the local syslog configur- +# ation that would prevent the event from being actually logged. +# +# The suggested values are: +# +# 6: This is the default value. Only the important events +# are logged. +# +# 7: Sets logs to level debug. +# +#SessionLogLevel 6 + +# +# Redirect NX Server to log to a custom file instead of logging to the +# system log, usually the /var/log/messages file. +# +#SystemLogFile /tmp/NX.log + +# +# Specify hostname for the NX Server. +# +#ServerName localhost.localdomain + +# +# Specify the TCP port where the SSHD daemon is listening on the NX +# Server host machine. +# +#SSHDPort 22 + +# +# Set the base display number for NX sessions. +# +#DisplayBase 1001 + +# +# Set the maximum number of displays reserved for NX sessions. +# +#DisplayLimit 200 + +# +# Set the maximum number of concurrent NX sessions. +# +#SessionLimit 20 + +# +# Specify the maximum number of concurrent NX sessions that can be run +# by a single user. By default a user can run as many sessions as they +# are allowed on the server. By setting this value to 1, the user has +# to terminate their disconnected session before starting a new one. +# +#SessionUserLimit 20 + +# +# Set for how long NX Server will retain data related to terminated +# sessions in its session history. +# +# <0: Never delete data from NX session history. +# +# 0: Disable NX sessions history. +# +# >0: Keep data in session history for this amount +# of seconds. +# +# The default value, 2592000 seconds, lets NX Server keep session data +# for 30 days. +# +#SessionHistory 2592000 + +# +# Allow NX Server to terminate oldest disconnected sessions: +# +# 1: Enabled. Enable the automatic kill of the disconnected +# sessions. +# +# 0: Disabled. Disconnected sessions are never terminated. +# +# When this option is set and the maximum number of concurrent sessions +# has been reached, the server will kill the oldest disconnected sessions to +# make room for the new session. +# +#EnableAutokillSessions 0 + +# +# Enable persistent sessions for users. If the option is followed by +# the keyword 'all', all users are allowed to run persistent sessions. +# Alternatively, it can be followed by a list of comma-separated user- +# names. The default value is 'all' which corresponds to enabling +# persistent sessions for all users. Values specified are overridden +# by the value set for the 'DisablePersistentSession' key. +# +#EnablePersistentSession all + +# +# Disable persistent sessions for users. If the option is followed by +# the keyword 'all', no user is allowed to run persistent sessions. Al- +# ternatively, the option can be followed by a list of comma-separated +# usernames. The default value is the empty string which corresponds +# to disabling persistent sessions for no user. The values specified +# override the values set for the 'EnablePersistentSession' key. +# +#DisablePersistentSession "" + +# +# Enable or disable SSH encryption of all traffic. +# +# 1: Enabled. Unencrypted connections between the proxies will +# be allowed. +# +# 0: Disabled. Forbid the use of unencrypted connections. The +# server will force the client to tunnel the proxy +# connections over the encrypted channel. +# +# Session negotiation happens across an encrypted channel. The user +# can specify if subsequent communication must take place through a +# direct connection between the proxies or by tunneling it through SSH. +# Uncomment the key and set the value to 0 to increase the security of +# the host server or if NX Server is behind a firewall preventing the +# access to the set of ports used by the NX Server. +# +# Unencrypted sessions require that the firewall lets the proxies +# communicate over the TCP ports ranging from: +# +# DisplayBase + 4000 +# +# to: +# +# DisplayBase + 4000 + DisplayLimit +# +#EnableUnencryptedSession 1 + +# +# Enable or disable clipboard: +# +# client: The content copied on the client can be pasted inside the +# NX session. +# +# server: The content copied inside the NX session can be pasted +# on the client. +# +# both: The copy&paste operations are allowed between both the +# client and the NX session and viceversa. +# +# none: The copy&paste operations between the client and the NX +# session are never allowed. +# +#EnableClipboard both + +# +# Enable or disable NX users DB: +# +# 1: Enabled. Only users listed in NX users DB can login to the NX +# server. +# +# 0: Disabled. All the authenticated users can login. +# +# If the NX user DB is disabled, any user providing a valid password +# from local DB or through SSHD authentication, can connect to the NX +# system. This is likely to be the default when SSHD authentication +# with PAM is enabled. +# +#EnableUserDB 0 + +# +# Enable or disable NX password DB: +# +# 1: Enabled. Use NX password DB to authenticate users. +# +# 0: Disabled. Use SSHD + PAM authentication. +# +# System administrators can enable a restricted set of users to con- +# nect to NX Server by setting EnableUserDB to 1 and adding +# those users to the DB. If user is enabled to connect, his/her pass- +# word will be verified against the current PAM settings by the SSHD +# daemon. +# +# If both 'EnableUserDB' and 'EnablePasswordDB' are set to 0, any +# user being authenticated by SSHD account will be enabled to connect +# to the system. +# +EnablePasswordDB 0 + +# +# Specify hostname of the server used for NX SSH authentication. +# +#SSHDAuthServer 127.0.0.1 + +# +# Specify the TCP port where the SSHD daemon is running on the NX SSH +# authentication server. +# +#SSHDAuthPort 22 + +# +# Enable or disable support for Kerberos tickets: +# +# 1: Enabled. NX Server will try to authenticate to the node by +# using the Kerberos ticket. +# +# 0: Disabled. NX Server authenticates to the node by using +# the nx key. +# +# Enabling this key has effect only when the client is trying to +# log-in to the server by using the nx key. +# +#EnableGSSAPIAuthentication 0 + +# +# Enable or disable statistics: +# +# 1: Enabled. Enable the production of NX statistics. +# +# 0: Disabled. Disable the production of NX statistics. +# +# Run the nxstat daemon in background. This daemon can be used to +# produce statistics about the NX services and the node host machine +# either for localhost and any of the available nodes when the load +# balancing is enabled. This requires that the nxsensor daemon is +# started on each of the node machines. +# +#EnableStatistics 0 + +# +# Specify the port where the server will contact the nxsensor daemons +# to collect the statistics. +# +#ServerSensorPort 19250 + +# +# Enable or disable starting the NX httpd service: +# +# 1: Enabled. Enable starting of the NX httpd daemon. +# +# 0: Disabled. Disable starting of the NX httpd daemon. +# +#EnableHttpd 1 + +# +# Enable or disable monitoring the NX Node host machines when multi- +# node environment is supported. +# +# 1: Enabled. Enable starting of the NX Server daemon. +# +# 0: Disabled. Disable starting of the NX Server daemon. +# +#EnableNodeMonitoring 0 + +# +# Set for how long the NX Server daemon has to wait for a reply from +# the node machine before considering this host unreachable. The +# default value is 10 seconds. +# +#NodeResponseTimeout 10 + +# +# Specify a list of comma-separated 'hostname:port' values for XDM +# server. +# +#RoundRobinXdmList localhost:177 + +# +# Enable or disable the XDM round robin query: +# +# 1: Enabled. Let NX Server decide XDM host according to hostnames +# that are defined in the RoundRobinXdmList key. +# +# 0: Disabled. +# +#EnableRoundRobinXdmQuery 1 + +# +# Enable or disable the XDM indirect query: +# +# 1: Enabled. Let the user obtain a list of available XDM hosts. +# +# 0: Disabled. +# +#EnableIndirectXdmQuery 0 + +# +# Enable or disable the XDM direct query: +# +# 1: Enabled. Let client specify XDM host. +# +# 0: Disabled. +# +#EnableDirectXdmQuery 0 + +# +# Enable or disable the XDM broadcast query: +# +# 1: Enabled. Let client connect to the first responding XDM host. +# +# 0: Disabled. +# +#EnableBroadcastXdmQuery 0 + +# +# Specify path and name of the command 'sessreg' for managing utmp and +# wtmp entries for non-init clients. +# +#CommandSessreg /usr/X11/bin/sessreg + +# +# Specify the location and name of the SSH authorized keys file. +# +SSHAuthorizedKeys authorized_keys + +# +# Accept or refuse the client connection if SSHD does not export +# the 'SSH_CONNECTION' and 'SSH_CLIENT' variables in the environment +# passed to the NX Server. +# +# 1: Refuse. Check the remote IP and do not accept the connection if it +# can't be determined. +# +# 0: Accept. Check the remote IP and accept the connection even if the +# remote IP is not provided. +# +#SSHDCheckIP 0 + +# +# Specify the base username to be used by NX Server to create guest +# users accounts. The server will add a progressive number to the +# name specified by GuestName, according to the range of values set +# in the BaseGuestUserId and GuestUserIdLimit keys. +# +#GuestName guest + +# +# Set the base User Identifier (UID) number for NX guest users. +# +#BaseGuestUserId 10 + +# +# Set the maximum User Identifier (UID) number reserved for NX guest +# users. +# +#GuestUserIdLimit 200 + +# +# Set the Group Identifier (GID) for NX guest users. The specified +# GID must already exist on the system. +# +#GuestUserGroup guest + +# +# Set the maximum number of concurrent NX guest users. +# +#GuestUserLimit 10 + +# +# Set the maximum number of NX sessions a NX guest user can run before +# his/her account is terminated. +# +#GuestUserConnectionLimit 5 + +# +# Set for how long NX Server has to retain NX guest users accounts. +# +# 0: NX guest users accounts are never removed. +# +# >0: Maintain NX guest users accounts for this amount +# of seconds. +# +# The default value, 2592000 seconds, lets NX Server keep guest users +# accounts for 30 days. +# +#GuestUserAccountExpiry 2592000 + +# +# Set for how long NX Server has to keep alive a NX guest user's +# session. When the time has expired, NX Server will kill the session. +# +# 0: NX guest user session is never terminated. +# +# >0: Keep NX guest user session live for this number +# of seconds. +# +#GuestConnectionExpiry 0 + +# +# Enable or disable possibility for NX guest users to disconnect their +# sessions: +# +# 1: Enabled. NX Server lets NX guest users disconnect sessions. +# +# 0: Disabled. +# +#GuestUserAllowDisconnect 1 + +# +# Set the home directory for NX guest users. Provide an empty value +# between double quotes to let NX Server create the guest user's home +# in the default directory set on the system. +# +#GuestUserHome /home + +# +# Enable or disable removing the NX guest user from the system when the +# account is expired: +# +# 1: Enabled. When the guest account is expired, NX Server will +# delete the account from both the system and the NX guests DB +# and will remove the home directory. +# +# 0: Disabled. When the guest account is expired, NX Server will +# keep the guest account on the system but will forbid this user +# to start new sessions on the server. +# +#EnableGuestWipeout 1 + +# +# Allow the server to set disk quota for the NX guest accounts: +# +# 1: Enabled. When a new guest account is created on the system, +# the server will set the disk quota for this user. +# +# 0: Disabled. No restrictions on the amount of disk space used +# by each guest user are applied. +# +#EnableGuestQuota 0 + +# +# Specify the username of the account to be used as a protoype for +# propagating its disk quota settings to all the new guest accounts. +# If the softlimit or the hardlimit on either the inode or the disk +# block are set, they will override the settings applied to the user +# prototype. +# +#GuestQuotaProtoname protoguest + +# +# Specify the maximum amount of disk space available for each of the +# guest users, checked as number of inodes. This limit can be exceeded +# for the grace period. +# +#GuestQuotaInodeSoftlimit 0 + +# +# Specify the absolute maximum amount of disk space available for +# each of the guest users, checked as number of inodes. Once this +# limit is reached, no further disk space can be used. +# +#GuestQuotaInodeHardlimit 0 + +# +# Specify the maximum amount of disk space available for each of the +# guest users, checked as number of disk blocks consumed. This limit +# can be exceeded for the grace period. +# +#GuestQuotaBlockSoftlimit 0 + +# +# Specify the absolute maximum amount of disk space available for each +# of the guest users, checked as number of disk blocks consumed. Once +# this limit is reached, no further disk space can be used. +# +#GuestQuotaBlockHardlimit 0 + +# +# Specify the grace period, expressed in seconds, during which the +# soft limit, set in the GuestQuotaInodeSoftlimit key may be +# exceeded. +# +#GuestQuotaInodeGracePeriod 0 + +# +# Specify the grace period, expressed in seconds, during which the +# soft limit, set in the GuestQuotaBlockSoftlimit key may be +# exceeded. +# +#GuestQuotaBlockGracePeriod 0 + +# +# Specify a list of comma-separated filesystem names or devices to +# which the disk quota restrictions will be applied. The default +# value is 'all' which corresponds to applying the disk quota limits +# to all the filesystems having disk quota enabled. +# +#GuestQuotaFilesystems all + +# +# Set the User Identifier (UID) number for NX users. If an empty value +# is specified, the NX Server will create the account with the default +# value set on the system. +# +#UserId 10 + +# +# Set the Group Identifier (GID) for NX users. If an empty value is +# specified, NX Server will create the account with the default +# value set on the system. +# +#UserGroup users + +# +# Set the home directory for NX users. If an empty value is specified, +# NX Server will create the user's home in the default directory +# set on the system. +# +#UserHome /home + +# +# Allow the user to connect to a virtual desktop: +# +# 1: Enabled. Each user can request to connect to a +# virtual desktop. +# +# 0: Disabled. Connections to a virtual desktop are +# forbidden. +# +#VirtualDesktopSharing 1 + +# +# Set the interaction level for the session connected to a virtual +# desktop: +# +# 0: View-only. The session is connected to the desktop in +# view-only mode, i.e. the user can't interact with the +# virtual desktop. +# +# 1: Restricted. User connected to the virtual desktop can +# interact with the desktop except for resize operations. +# +# 2: Interactive. User connected to the virtual desktop has +# full interaction with the desktop. +# +#VirtualDesktopMode 2 + +# +# Enable or disable NX Server requesting authorization to the owner of +# the virtual desktop before connecting. +# +# 1: Enabled. NX Server asks for authorization to the owner +# of the virtual desktop before trying to connect. +# +# 0: Disabled. NX Server tries to connect to the virtual +# desktop without the need for any authorization from the +# desktop's owner. +# +#VirtualDesktopAuthorization 0 + +# +# Allow the user to connect to the physical desktop: +# +# 1: Enabled. Each user can request to connect to the +# physical desktop. +# +# 0: Disabled. Connections to the physical desktop are +# forbidden. +# +#PhysicalDesktopSharing 1 + +# +# Set the interaction level for the session connected to the physical +# desktop: +# +# 0: View-only. The session is connected to the desktop in +# view-only mode, i.e. the user can't interact with the +# physical desktop. +# +# 1: Interactive. User connected to the physical desktop has +# full interaction with the desktop. +# +#PhysicalDesktopMode 1 + +# +# Enable or disable NX Server requesting authorization to the owner of +# the physical desktop before connecting. +# +# 1: Enabled. NX Server asks for authorization to the owner +# of the physical desktop before trying to connect. +# +# 0: Disabled. NX Server tries to connect to the physical +# desktop without the need for any authorization from the +# desktop's owner. +# +#PhysicalDesktopAuthorization 0 + +# +# Specify absolute path of the custom script to be executed before +# the user logs in. The script can accept remote IP of the user's +# machine as its input. +# +# E.g. UserScriptBeforeLogin /tmp/nxscript/script.sh +# +#UserScriptBeforeLogin "" + +# +# Specify absolute path of the custom script to be executed after +# the user logs in. The script can accept username as its input. +# +#UserScriptAfterLogin "" + +# +# Specify absolute path of the custom script to be executed before +# the session start-up. The script can accept session ID, username, +# node host and node port as its input. +# +#UserScriptBeforeSessionStart "" + +# +# Specify absolute path of the custom script to be executed after the +# session start-up. The script can accept session ID, username, node +# host and node port as its input. +# +#UserScriptAfterSessionStart "" + +# +# Specify absolute path of the custom script to be executed before +# the session is closed. The script can accept session ID, username, +# node host and node port as its input. +# +#UserScriptBeforeSessionClose "" + +# +# Specify absolute path of the custom script to be executed after the +# session is closed. The script can accept session ID, username, node +# host and node port as its input. +# +#UserScriptAfterSessionClose "" + +# +# Specify absolute path of the custom script to be executed before +# the session is reconnected. The script can accept session ID user- +# name, node host and node port as its input. +# +#UserScriptBeforeSessionReconnect "" + +# +# Specify absolute path of the custom script to be executed after the +# session is reconnected. The script can accept session ID username +# node host and node port as its input. +# +#UserScriptAfterSessionReconnect "" + +# +# Specify absolute path of the custom script to be executed before +# the session is disconnected. The script can accept session ID, user- +# name, node host and node port as its input. +# +#UserScriptBeforeSessionDisconnect "" + +# +# Specify absolute path of the custom script to be executed after +# the session is disconnected. The script can accept session ID, user- +# name, node host and node port as its input. +# +#UserScriptAfterSessionDisconnect "" + +# +# Specify absolute path of the custom script to be executed before +# session failure. The script can accept session ID username, node +# host and node port as its input. +# +#UserScriptBeforeSessionFailure "" + +# +# Specify absolute path of the custom script to be executed after +# session failure. The script can accept session ID username, node +# host and node port as its input. +# +#UserScriptAfterSessionFailure "" + +# +# Specify absolute path of the custom script to be executed before +# NX Server creates the new account. The script can accept username +# as its input. +# +#UserScriptBeforeCreateUser "" + +# +# Specify absolute path of the custom script to be executed after +# NX Server has created the new account. The script can accept user- +# name as its input. +# +#UserScriptAfterCreateUser "" + +# +# Specify absolute path of the custom script to be executed before +# NX Server removes the account. The script can accept username as +# its input. +# +#UserScriptBeforeDeleteUser "" + +# +# Specify absolute path of the custom script to be executed after +# NX Server has removed the account. The script can accept username +# as its input. +# +#UserScriptAfterDeleteUser "" + +# +# Specify absolute path of the custom script to be executed before +# NX Server disables the user. The script can accept username as its +# input. +# +#UserScriptBeforeDisableUser "" + +# +# Specify absolute path of the custom script to be executed after +# NX Server has disabled the user. The script can accept username +# as its input. +# +#UserScriptAfterDisableUser "" + +# +# Specify absolute path of the custom script to be executed before +# NX Server enables the user. The script can accept username as its +# input. +# +#UserScriptBeforeEnableUser "" + +# +# Specify absolute path of the custom script to be executed after +# NX Server has enabled the user. The script can accept username +# as its input. +# +#UserScriptAfterEnableUser "" + +# +# Allow the root user (or Administrator on a Windows machine) to +# run NX sessions. +# +# 1: Enabled. Allow an NX user to run sessions as user with +# administrative rights. +# +# 0: Disabled. NX Server forbids an NX user to log in as user +# having administrative privileges. +# +#EnableAdministratorLogin 0 + +# +# Specify path to the SSH client. +# +#SSHClient /usr/bin/ssh + +# +# Specify a list of comma-separated session types available on this +# server. +# +#AvailableSessionTypes "" + diff -Naur src-nxserver/NX/scripts/etc/nxserver src-nxserver-magellan/NX/scripts/etc/nxserver --- src-nxserver/NX/scripts/etc/nxserver 2012-03-09 17:26:44.000000000 +0100 +++ src-nxserver-magellan/NX/scripts/etc/nxserver 2012-05-08 13:54:24.873982523 +0200 @@ -19,6 +19,9 @@ elif [ -x /usr/bin/awk ] then COMMAND_AWK="/usr/bin/awk" +elif [ -x /bin/awk ] +then + COMMAND_AWK="/bin/awk" else COMMAND_AWK="awk" fi diff -Naur src-nxserver/NX/scripts/setup/nxserver src-nxserver-magellan/NX/scripts/setup/nxserver --- src-nxserver/NX/scripts/setup/nxserver 2012-04-20 11:05:53.000000000 +0200 +++ src-nxserver-magellan/NX/scripts/setup/nxserver 2012-05-08 14:04:02.636982523 +0200 @@ -85,6 +85,13 @@ { ret_getLinuxName=0 + # prefer os-release + if [ -f /etc/os-release ]; + then + system=$(source /etc/os-release; echo "${ID}") + return 0 + fi + if [ -f /etc/SuSE-release ]; then system=suse @@ -109,6 +116,12 @@ return 0 fi + if [ -f /etc/mageversion ]; + then + system=magellan + return 0 + fi + if [ -f /etc/debian_version ]; then system=debian @@ -179,6 +192,9 @@ if [ -x "/bin/unlink" ]; then UNLINKCOMMAND="/bin/unlink" +elif [ -x "/usr/bin/unlink" ]; +then + UNLINKCOMMAND="/usr/bin/unlink" elif [ -x "/usr/sbin/unlink" ]; then UNLINKCOMMAND="/usr/sbin/unlink" @@ -236,6 +252,9 @@ if [ -x "/usr/bin/awk" ]; then AWKCOMMAND="/usr/bin/awk" + elif [ -x "/bin/awk" ]; + then + AWKCOMMAND="/bin/awk" else AWKCOMMAND="awk" fi @@ -293,7 +312,7 @@ SEDCOMMAND="sed" fi else - if [ -x "/bin/grep" ]; + if [ -x "/bin/sed" ]; then SEDCOMMAND="/bin/sed" else @@ -480,6 +499,9 @@ if [ -x "/sbin/pidof" ]; then PIDOFCOMMAND="/sbin/pidof" +elif [ -x "/bin/pidof" ]; +then + PIDOFCOMMAND="/bin/pidof" else PIDOFCOMMAND="pidof" fi @@ -2061,6 +2083,7 @@ ${ECHOCOMMAND} " 11.04 Natty Narwhal/11.10 Oneiric Ocelot etc." ${ECHOCOMMAND} " solaris Sun Solaris 10.0 etc." ${ECHOCOMMAND} " fedora Fedora 10/11/12/13/14/15/16 etc." + ${ECHOCOMMAND} " magellan Magellan-Linux 0.8.x/0.9.x/0.10.x/R.11 etc." } updatePathsInFile () @@ -3001,6 +3024,9 @@ elif [ "$system" = "fedora" ]; then detectedSystem="Fedora" + elif [ "$system" = "magellan" ]; + then + detectedSystem="Magellan-Linux" elif [ "$system" = "debian" ]; then detectedSystem="Debian" @@ -3390,6 +3416,7 @@ "suse" ) ;; "mandriva" ) ;; "fedora" ) ;; + "magellan" ) ;; "debian" ) ;; "solaris" ) ;; "macosx" ) ;; @@ -3530,6 +3557,7 @@ /etc/debian_version /etc/debian_release /etc/fedora-release +/etc/mageversion /etc/gentoo-release /etc/immunix-release knoppix_version @@ -3559,6 +3587,7 @@ /etc/va-release /etc/yellowdog-release /etc/system-release +/etc/os-release ) getVersionFromLSB() @@ -4496,7 +4525,7 @@ LICENSE_FILE="${NX_ROOT}/etc/server.lic" NODE_LICENSE_FILE="${NX_ROOT}/etc/node.lic" - FILE_AUTHORIZED_KEYS="${NXHOME}/.ssh/authorized_keys2" + FILE_AUTHORIZED_KEYS="${NXHOME}/.ssh/authorized_keys" WRAPPER="${NX_ROOT}/bin/nxexec" @@ -5007,6 +5036,12 @@ removeNXinit () { + # do nothing on magellan + if [ "$system" = "magellan" ]; + then + return + fi + if [ "${system}" = "fedora" ] || [ "${system}" = "redhat" ] || [ "${system}" = "suse" ]; then if [ -f "/sbin/chkconfig" ]; @@ -5215,6 +5250,12 @@ addNXinit () { + # do nothing on magellan + if [ "$system" = "magellan" ]; + then + return + fi + if [ "${system}" = "macosx" ]; then return 0 @@ -7656,6 +7697,7 @@ /etc/server-fedora.cfg.sample /etc/server-mandriva.cfg.sample /etc/server-redhat.cfg.sample +/etc/server-magellan.cfg.sample /etc/server-suse.cfg.sample /etc/server-solaris.cfg.sample /etc/server-macosx.cfg.sample @@ -8707,6 +8749,12 @@ addNxhttpdUserLinux () { + # simply abort if the user exist. on magellan this user is already created. + if id nxhttpd > /dev/null 2>&1 + then + return + fi + checkNxhttpdGroupExist if [ "x${ret_checkNxhttpdGroupExist}" = "x0" ]; then