Changeset 06a2b49

Timestamp:

Jan 21, 2013 11:05:56 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

328e93f

Parents:

5dbcc93 (diff), dcac546 (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 ​git://fedd.deterlab.net/fedd

Files:

• fedd/federation/desktop_access.py (added)
• fedd/federation/deter_impl.py (modified) (2 diffs)
• fedkit/federate.pl (modified) (1 diff)
• fedkit/gateway_lib.pm (modified) (3 diffs)
• fedkit/prep_gateway.pl (modified) (1 diff)

fedd/federation/deter_impl.py

@@ -8 +8 @@
 import deter_internal_access
 import benito_access
+import desktop_access
 import skeleton_access
 
@@ -89 +90 @@
                 elif self.access_type == "benito":
                     self.access = benito_access.access(config, self.auth)
+                elif self.access_type == "desktop":
+                    self.access = desktop_access.access(config, self.auth)
                 elif self.access_type == "skel":
                     self.access = skeleton_access.access(config, self.auth)

fedkit/federate.pl

@@ -236 +236 @@
         system("/etc/rc.d/init.d/ntpd stop; /usr/sbin/ntpdate boss; ". 
             "/etc/rc.d/init.d/ntpd start");
-    elsif (-d "/etc/init.d" ) {
+    } elsif (-d "/etc/init.d" ) {
         system("service ntp stop; /usr/sbin/ntpdate boss; ". 
             "service ntp start");

fedkit/gateway_lib.pm

@@ -33 +33 @@
 my $IPROUTE = "/sbin/ip route ";
 
+$BRCTL = '/sbin/brctl' unless -x $BRCTL ;
+
 # Takes an ssh config file and a reference to a hash of keys whose values must
 # be set a specific way.  Replaces existing entries with the set values.
@@ -44 +46 @@
     $t = new File::Temp() || die "Can't open tempfile: $!\n";
 
+    # If the parameter is in the file (even in a comment) update the line to
+    # have the new parameter.
+    my %updated;
     while (<$f>) {
         foreach my $k (keys %{$keys}) {
-            s/^\s*#?\s*$k.*/$k $keys->{$k}/;
+            if (s/^\s*#?\s*$k.*/$k $keys->{$k}/) { $updated{$k}++; }
         }
         print $t $_;
+    }
+    # Any parameters not found above are output directly.
+    foreach my $k (keys %{$keys}) {
+        print $t "$k " . $keys->{$k} . "\n" unless $updated{$k};
     }
     $f->close();
@@ -278 +287 @@
     $ipipe->reader("$IFCONFIG");
     while(<$ipipe>) {
-        /^([[:alnum:]]+):/ && do {
+        /^([[:alnum:]]+):?/ && do {
             $iface = $1;
             next;
         };
-        /inet\s+([0-9\.]+)/ && do {
-            if ($1 eq $addr) {
+        /inet(\s+addr:)?\s*([0-9\.]+)/ && do {
+            if ($2 eq $addr) {
                 $ipipe->close();
                 return $iface;

fedkit/prep_gateway.pl

@@ -40 +40 @@
     gateway_lib::set_sshd_params( 
         { 'GatewayPorts' => 'yes', 'PermitTunnel' => 'yes' } );
-    system("/etc/init.d/sshd restart");
+    if ( -x "/etc/init.d/sshd") {
+        system("/etc/init.d/sshd restart");
+    }
+    elsif (-x "/etc/init.d/ssh") {
+        # XXX should look for service
+        system("/etc/init.d/ssh restart");
+    }
+    else {
+        print "Cannot figure out how to restart sshd\n";
+    }
     gateway_lib::import_key($ssh_pubkey,'/root/.ssh/authorized_keys')
         if $ssh_pubkey;
+    # Make sure the tap interface is available
+    system('modprobe tun');
     # Install bridging software if not present
     if ( -x '/usr/bin/yum' ) {