Add support for architecture specific config files.

This is useful when you are sharing a config file between
a number of hosts, of which not all are the same architecture.

diff --git a/src/spong-client.pl b/src/spong-client.pl
index 083eee74de3a0e1fe5b7f15fb8707dee7a33165e..052c31bd708c290bfd7094b047e0bdd866e5c739 100755 (executable)
--- a/src/spong-client.pl
+++ b/src/spong-client.pl
@@ -167,6 +167,14 @@ sub init_logging {
 
 sub load_config_files {
    require $conf_file || die "Can't load $conf_file: $!";
+
+   my ($sysname) =  (uname)[0];
+   $sysname =~ s/[^A-Za-z0-9]/_/g;  # Eat any nasty characters
+
+   if( -f "$conf_file.$sysname" ) {
+      require "$conf_file.$sysname" || die "Can't load $conf_file.$sysname: $!";
+   }
+
    if( -f "$conf_file.$HOST" ) {
       require "$conf_file.$HOST" || die "Can't load $conf_file.$HOST: $!";
    } else {

diff --git a/src/spong-network.pl b/src/spong-network.pl
index 72f744729ded0c865a342fe036f12a182bff2e4e..86d04397dace22ba20ccbd4c346da327137aed18 100755 (executable)
--- a/src/spong-network.pl
+++ b/src/spong-network.pl
@@ -464,6 +464,14 @@ sub init_logging {
 
 sub load_config_files {
    require $conf_file || die "Can't load $conf_file: $!";
+
+   my ($sysname) =  (uname)[0];
+   $sysname =~ s/[^A-Za-z0-9]/_/g;  # Eat any nasty characters
+
+   if( -f "$conf_file.$sysname" ) {
+      require "$conf_file.$sysname" || die "Can't load $conf_file.$sysname: $! ";
+   }
+
    if( -f "$conf_file.$HOST" ) {
       require "$conf_file.$HOST" || die "Can't load $conf_file.$HOST: $!";
    } else {

diff --git a/src/spong-server.pl b/src/spong-server.pl
index b804253c1c80dcec3ce5fbf8d05b939af4dd1568..0f97779e9ab56f7c54136cea73c5bd473020087b 100755 (executable)
--- a/src/spong-server.pl
+++ b/src/spong-server.pl
@@ -1320,6 +1320,13 @@ sub remove_np_files {
 sub load_config_files {
    my( $evalme, $inhosts );
 
+   my ($sysname) =  (uname)[0];
+   $sysname =~ s/[^A-Za-z0-9]/_/g;  # Eat any nasty characters
+
+   if( -f "$conf_file.$sysname" ) {
+      require "$conf_file.$sysname" || die "Can't load $conf_file.$sysname: $!";
+   }
+
    require $conf_file || die "Can't load $conf_file: $!";
    if( -f "$conf_file.$HOST" ) {
       require "$conf_file.$HOST" || die "Can't load $conf_file.$HOST: $!";