svn commit: r1208740 - in /incubator/vcl/trunk/managementnode: bin/S99vcld.linux etc/vcl/vcld.conf

[fa...@apache.org]

Author: fapeeler
Date: Wed Nov 30 19:59:49 2011
New Revision: 1208740

URL: http://svn.apache.org/viewvc?rev=1208740&view=rev
Log:
VCL-468

uploaded wrong startup script and conf file in previous commit 


Modified:
    incubator/vcl/trunk/managementnode/bin/S99vcld.linux
    incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf

Modified: incubator/vcl/trunk/managementnode/bin/S99vcld.linux
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/bin/S99vcld.linux?rev=1208740&r1=1208739&r2=1208740&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/bin/S99vcld.linux (original)
+++ incubator/vcl/trunk/managementnode/bin/S99vcld.linux Wed Nov 30 19:59:49 2011
@@ -22,16 +22,15 @@
 # description: VCL management node daemon
 
 # DAEMON: Name of the daemon executable
-DAEMON=vcldfap
+DAEMON=vcld
 
 # DAEMON_PATH: Path to the daemon, no trailing '/'
-DAEMON_PATH=/usr/local/vcldev/fap/managementnode/bin
+DAEMON_PATH=/usr/local/vcl/bin
 
 # DAEMON_OPTIONS: options for the daemon, these can be overridden by
 # setting DAEMON_OPTIONS in /etc/sysconfig/$DAEMON
-DAEMON_OPTIONS='-v -conf=/usr/local/vcldev/fap/managementnode/etc/vcl/vcld.conf'
+DAEMON_OPTIONS='-v -conf=/etc/vcl/vcld.conf'
 
-cp /dev/null /usr/local/vcldev/fap/managementnode/vcldfap.log
 
 # You shouldn't need to edit anything below here
 # --------------------------------------------------------------------

Modified: incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf?rev=1208740&r1=1208739&r2=1208740&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf (original)
+++ incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf Wed Nov 30 19:59:49 2011
@@ -34,31 +34,31 @@
 
 # FQDN: DNS name of the management node
 # Example: mgtnode1.hpc.someschool.edu
-FQDN=vcl00mn.hpc.ncsu.edu
+FQDN=
 
 # processname: name to call VCL daemon process
 # Default: vcld
-processname=vcldfap
+processname=vcld
 
 # log: log file location
 # Default: /var/log/vcld.log
 # If left undefined it will be named according to the above processname
 # i.e. /var/log/$PROCESSNAME.log
-log=/usr/local/vcldev/fap/managementnode/vcldfap.log
+log=/var/log/vcld.log
 
 # pidfile: process id file location 
-# Default: /var/run/vcldfap.pid
+# Default: /var/run/vcld.pid
 # If left undefined it will be named according to the above processname
 # i.e. /var/run/$PROCESSNAME.pid
-pidfile=/var/run/vcldfap.pid
+pidfile=/var/run/vcld.pid
 
 # Database connection information
 
 # database: name of MySQL database (required)
-database=vcldev
+database=vcl
 
 # server: IP address or FQDN of the database server (required)
-server=152.7.98.108
+server=
 
 # LockerWrtUser: MySQL user account name with write privileges (required)
 LockerWrtUser=vcl-wrt
@@ -66,7 +66,7 @@ LockerWrtUser=vcl-wrt
 # wrtPass: MySQL password of the above LockerWrtUser (required)
 # Any length is supported by MySQL
 # Must be a string of characters: A-Z a-z 0-9
-wrtPass=iM5jNOPWyStu6
+wrtPass=
 
 # xml-rpc username password and url information
 # Required for block reservation processing
@@ -76,9 +76,9 @@ wrtPass=iM5jNOPWyStu6
 #   for example, if you install the VCL web code at https://vcl.example.org/vcl/
 #   set xmlrpc_url to https://vcl.example.org/vcl/index.php?mode=xmlrpccall
 
-xmlrpc_username=admin@local
-xmlrpc_pass=vclc1-5devserver
-xmlrpc_url=https://vcldev.csc.ncsu.edu/vcl/index.php?mode=xmlrpccall
+xmlrpc_username=vclsystem
+xmlrpc_pass=insecureDefault
+xmlrpc_url=
 
 ######### END REQUIRED Configuration settings ##############