Changeset 5e71d34

Timestamp:

Jan 18, 2013 10:06:54 AM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

8f654de

Parents:

950b55e

Message:

Fix fedkit to work on Ubuntu 12.04

Location:

fedkit

Files:

• gateway_lib.pm (modified) (1 diff)
• prep_gateway.pl (modified) (1 diff)

fedkit/gateway_lib.pm

@@ -44 +44 @@
     $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();

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;