Author: arkurth
Date: Mon Sep 28 19:25:26 2009
New Revision: 819683
URL: http://svn.apache.org/viewvc?rev=819683&view=rev
Log:
VCL-135
Updated comment in reserved.pm referencing NCSU regarding the STANDALONE flag.
Changed comments in vcld.conf to use a generic school name instead of NCSU.
Modified:
incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf
incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm
Modified: incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf?rev=819683&r1=819682&r2=819683&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf (original)
+++ incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf Mon Sep 28 19:25:26
2009
@@ -33,7 +33,7 @@
############# REQUIRED Configuration settings ################
# FQDN: DNS name of the management node
-# Example: mgtnode1.hpc.ncsu.edu
+# Example: mgtnode1.hpc.someschool.edu
FQDN=
# processname: name to call VCL daemon process
@@ -107,7 +107,7 @@
# list of email addresses to be used for critical notices regarding failures
or problems
# optional, but not recommended to leave blank
# Format: comma delimited list
-# Example: john_...@ncsu.edu,sysadm...@vcl.ncsu.edu
+# Example: john_...@someschool.edu,sysadm...@vcl.someschool.edu
sysadmin=
#Sendmail envelope sender -- Return-path
Modified: incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm?rev=819683&r1=819682&r2=819683&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm Mon Sep 28 19:25:26
2009
@@ -251,7 +251,8 @@
}
# Check if user was set to standalone
- # Occurs if affiliation is not NCSU or if
vcladmin is the user
+ # Occurs if affiliation is not specified in the
NOT_STANDALONE property in vcld.conf
+ # or if vcladmin is the user or if the user's
UID is >= 1,000,000
if ($user_standalone) {
if
(changelinuxpassword($computer_short_name, $user_unityid,
$reservation_password)) {
# Password successfully changed
