switch config location to /etc/scire/

add config defaults to scireclient

svn path=/branches/new-fu/; revision=301

2 files changed, 13 insertions, 2 deletions

diff --git a/client/scireclient.pl b/client/scireclient.pl
index 490a85b..b93c79a 100755
--- a/client/scireclient.pl
+++ b/client/scireclient.pl
@@ -11,7 +11,8 @@ use Data::Dumper;
 use File::Path;
 use Sys::Hostname;
 
-my $SCIRE_CONFIG_FILE = '../etc/scire.conf'; #will be /etc/scire.conf when released.
+my $ETC_DIR = "/etc/scire";
+my $SCIRE_CONFIG_FILE = "${ETC_DIR}/scire.conf";
 my %conf;
 my ($SERVER_STDOUT, $SERVER_STDIN);
 my $connection_pid;
@@ -144,6 +145,10 @@ sub check_job_dir {
 
 sub read_config_file {
 	my $conf_file = shift;
+	my %config_defaults = (
+		"key_file" => "${ETC_DIR}/client_key",
+		"debug" => 0,
+	);
 	open(FH, "< ${conf_file}") or die("Couldn't open the config file ${conf_file}: $!");
 	while (<FH>) {
 		chomp;
@@ -155,6 +160,11 @@ sub read_config_file {
 		}
 	}
 	close(FH) or die("Couldn't close the config file ${conf_file}: $!");
+	for(keys %config_defaults) {
+		if(!defined $conf{$_}) {
+			$conf{$_} = $config_defaults{$_};
+		}
+	}
 }
 
 sub register_client {
diff --git a/server/scireserver.pl b/server/scireserver.pl
index 6e0d593..4de6362 100755
--- a/server/scireserver.pl
+++ b/server/scireserver.pl
@@ -10,7 +10,8 @@ use Digest::MD5 qw(md5 md5_hex );
 
 $| = 1;
 
-my $SCIRE_CONFIG_FILE = '../etc/scireserver.conf'; #will be /etc/scire.conf when released.
+my $ETC_DIR = "/etc/scire";
+my $SCIRE_CONFIG_FILE = "${ETC_DIR}/scireserver.conf";
 my %conf;
 my $LOGFILE;