Changeset 328e93f for fedkit/federate.pl

Timestamp:

Feb 1, 2013 1:25:43 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

17c6d91

Parents:

9a52a80 (diff), 06a2b49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

File:

• fedkit/federate.pl (modified) (3 diffs)

fedkit/federate.pl

@@ -88 +88 @@
 
     foreach my $fn ("seer.conf", "client.conf", "userconf", "hosts",
-            "ca.pem", "node.pem") {
+            "ca.pem", "node.pem", "route.tgz") {
         copy("$shared_config_dir/$fn", $local_config_dir )
             if -e "$shared_config_dir/$fn";
     }
+    # If there are static routes, unpack them
+    system("tar -C $local_config_dir -xzf $local_config_dir/route.tgz")
+        if -e "$local_config_dir/route.tgz";
 
     # Copy seer authorization files into the location that standard SEER
@@ -169 +172 @@
 
 if ($uname =~ /Linux/ ) {
-    system("$perl /usr/local/federation/bin/gated_routing.pl")
-        if -r "/usr/local/federation/bin/gated_routing.pl";
+    system("$perl /usr/local/federation/bin/static_routing.pl")
+        if -r "/usr/local/federation/bin/static_routing.pl";
+    if ($?) {
+        system("$perl /usr/local/federation/bin/gated_routing.pl")
+            if -r "/usr/local/federation/bin/gated_routing.pl";
+        }
     if ($?) {
         system("$perl /usr/local/federation/bin/quagga_routing.pl")
@@ -177 +184 @@
 }
 elsif ($uname =~/FreeBSD/ ) {
-    # FreeBSD needs to have ospfs installed and a router config created and
-    # run.
-    system("$perl /usr/local/federation/bin/ospf_routing.pl")
-        if -r "/usr/local/federation/bin/ospf_routing.pl";
+    system("$perl /usr/local/federation/bin/static_routing.pl")
+        if -r "/usr/local/federation/bin/static_routing.pl";
+    if ($?) {
+        # FreeBSD needs to have ospfs installed and a router config created and
+        # run.
+        system("$perl /usr/local/federation/bin/ospf_routing.pl")
+            if -r "/usr/local/federation/bin/ospf_routing.pl";
+    }
 }