X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=b9031719718fc291e1ef18343a65b4639af872a8;hb=c0ed0767aca53860c451894752ef1b4cd864884f;hp=3b931a0fba1b8407ee37592d65cd16013e462b27;hpb=c719f7d042e1cc5af74d4c19fc2563de6df7269a;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 3b931a0f..b9031719 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -12,6 +12,19 @@
 
 require 5.004;
 
+package main;
+
+# set default paths, these should be overwritten by DXVars.pm
+use vars qw($data $system $cmd $localcmd $userfn $clusteraddr $clusterport $yes $no $user_interval $lang);
+
+$lang = 'en';                   # default language
+$clusteraddr = '127.0.0.1';     # cluster tcp host address - used for things like console.pl
+$clusterport = 27754;           # cluster tcp port
+$yes = 'Yes';                   # visual representation of yes
+$no = 'No';                     # ditto for no
+$user_interval = 11*60;         # the interval between unsolicited prompts if no traffic
+
+
 # make sure that modules are searched in the order local then perl
 BEGIN {
 	umask 002;
@@ -30,6 +43,11 @@ BEGIN {
 
 	mkdir "$root/local_cmd", 0777 unless -d "$root/local_cmd";
 
+	$data = "$root/data";
+	$system = "$root/sys";
+	$cmd = "$root/cmd";
+	$localcmd = "$root/local_cmd";
+	$userfn = "$data/users";
 
 	# try to create and lock a lockfile (this isn't atomic but
 	# should do for now
@@ -118,8 +136,8 @@ package main;
 
 use strict;
 use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects
-			$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
-			$clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
+			$zombies $root @listeners $lang $myalias @debug $userfn
+			$mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
 			$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
 			$can_encode $maxconnect_user $maxconnect_node
 		   );
@@ -423,13 +441,24 @@ Bands::load();
 dbg("loading user file system ...");
 DXUser->init($userfn, 1);
 
+
 # look for the sysop and the alias user and complain if they aren't there
 {
 	die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
 	my $ref = DXUser::get($mycall);
 	die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+	my $oldsort = $ref->sort;
+	if ($oldsort ne 'S') {
+		$ref->sort('S');
+		dbg "Resetting node type from $oldsort -> DXSpider ('S')";
+	}
 	$ref = DXUser::get($myalias);
 	die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+	$oldsort = $ref->sort;
+	if ($oldsort ne 'U') {
+		$ref->sort('U');
+		dbg "Resetting sysop user type from $oldsort -> User ('U')";
+	}
 }
 
 # start listening for incoming messages/connects