Changeset 1d91791f

Timestamp:

Aug 13, 2010 1:34:29 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

5c35160

Parents:

c2f92c5

Message:

Remove support for ancient linux distros, which effectively adds support for
modern ones.

Location:

fedkit

Files:

• federate.pl (modified) (1 diff)
• prep_gateway.pl (modified) (1 diff)

fedkit/federate.pl

@@ -51 +51 @@
 
 if ($install_smb) {
-    # fix yum.conf
-    copy("/etc/yum.conf", "/etc/yum.conf.bak");
-    my $from = new IO::File("/etc/yum.conf.bak");
-    my $to = new IO::File(">/etc/yum.conf");
-    while (<$from>) {
-        s/download.fedoralegacy.org/fedoralegacy.lsu.edu/g;
-        print $to $_;
-    }
-    $from->close();
-    $to->close();
-    # Now, samba.  Because of the python dance on PG, we need to call python2.2
-    # explicitly
-    system('/usr/bin/python2.2 /usr/bin/yum -y install samba-client');
-    # These tools expect the fstab to include smbfs instead
-    $smb_type = 'smbfs';
+    # Install samba
+    system('/usr/bin/yum -y install samba-client');
+    # These tools expect the fstab to include cifs
+    $smb_type = 'cifs';
 }
 

fedkit/prep_gateway.pl

@@ -37 +37 @@
 
 if ($uname =~ /Linux/) {
-    # Right now the only gateway nodes that are Linux nodes are ProtoGENI
-    # nodes.  They need a bunch of custom updates to get into the 21st century,
-    # but they are on the network.
-    if ( -x '/usr/local/federation/bin/sshd' && 
-            -e '/usr/local/federation/etc/sshd_config') {
-        # Start our modern sshd if one is there
-        system("/usr/local/federation/bin/sshd -p 20200 -f " .
-            "/usr/local/federation/etc/sshd_config");
-    }
-    # fix yum.conf
-    copy("/etc/yum.conf", "/etc/yum.conf.bak");
-    my $from = new IO::File("/etc/yum.conf.bak");
-    my $to = new IO::File(">/etc/yum.conf");
-    while (<$from>) {
-        s/download.fedoralegacy.org/fedoralegacy.lsu.edu/g;
-        print $to $_;
-    }
-    $from->close();
-    $to->close();
-    # Now, bridging (use old python...)
-    system('/usr/bin/python2.2 /usr/bin/yum -y install bridge-utils');
-    #and keys
+    # Install bridging software if not present
+    system('/usr/bin/yum -y install bridge-utils');
+    # Restart sshd with tunnel params
+    gateway_lib::set_sshd_params( 
+        { 'GatewayPorts' => 'yes', 'PermitTunnel' => 'yes' } );
+    system("/etc/init.d/sshd restart");
     gateway_lib::import_key($ssh_pubkey,'/root/.ssh/authorized_keys')
         if $ssh_pubkey;