o Add setup-openssh-keys and its perl script to the list of packaged files

 o Edit setup-openssh-keys.pl to translate paths related to the scp, sshd,
     and sftp wrapper scripts
 o Edit setup-openssh.pl to print out suggestion regarding running
     setup-openssh-keys.pl if host keys are needed.

diff --git a/setup/filelist b/setup/filelist
index 78eafeb1fa364446313de608ffe66ef018099107..c5cdd0b224fa4611ab7dd6176df72807dd1b939d 100644 (file)
--- a/setup/filelist
+++ b/setup/filelist
@@ -1,2 +1,4 @@
 setup/globus/setup-openssh
 setup/globus/setup-openssh.pl
+setup/globus/setup-openssh-keys
+setup/globus/setup-openssh-keys.pl

diff --git a/setup/setup-openssh-keys.pl b/setup/setup-openssh-keys.pl
index c38b462ece2fde360325e7382b1e9cc32c5616f5..20f3affd67ee5d8033875e710c70303fbd87658f 100644 (file)
--- a/setup/setup-openssh-keys.pl
+++ b/setup/setup-openssh-keys.pl
@@ -1,8 +1,6 @@
 #
 # setup-openssh-keys.pl:
-#   Adapts the installed gsi-ssh environment to the current machine,
-#   performing actions that originally occurred during the package's
-#   'make install' phase.
+#   Generates the host keys for the openssh install.
 #
 # Send comments/fixes/suggestions to:
 # Chase Phillips <cphillip@ncsa.uiuc.edu>
@@ -36,13 +34,6 @@ print "$myname: Configuring keys for package 'gsi_openssh'...\n";
 $prefix = ${globusdir};
 $exec_prefix = "${prefix}";
 $bindir = "${exec_prefix}/bin";
-$mandir = "${prefix}/man";
-$mansubdir = "man";
-$libexecdir = "${exec_prefix}/libexec";
-$sysconfdir = "${prefix}/etc";
-$piddir = "/var/run";
-$xauth_path = "/usr/bin/X11/xauth";
-
 $sysconfdir = "/etc";
 
 sub runkeygen
@@ -81,11 +72,4 @@ sub runkeygen
     return 0;
 }
 
-fixpaths();
 runkeygen();
-
-my $metadata = new Grid::GPT::Setup(package_name => "gsi_openssh_setup");
-
-$metadata->finish();
-
-print "$myname: Finished configuring package 'gsi_openssh'.\n";

diff --git a/setup/setup-openssh.pl b/setup/setup-openssh.pl
index 3ed7df05b588c0c5cef34d562437c708b26defc6..917f53d1258191c472eae0c74c2e80552ec129fa 100644 (file)
--- a/setup/setup-openssh.pl
+++ b/setup/setup-openssh.pl
@@ -38,6 +38,7 @@ print "$myname: Configuring package 'gsi_openssh'...\n";
 $prefix = ${globusdir};
 $exec_prefix = "${prefix}";
 $bindir = "${exec_prefix}/bin";
+$sbindir = "${exec_prefix}/sbin";
 $mandir = "${prefix}/man";
 $mansubdir = "man";
 $libexecdir = "${exec_prefix}/libexec";
@@ -67,6 +68,10 @@ sub fixpaths
         "/usr/bin:/bin:/usr/sbin:/sbin" => "/usr/bin:/bin:/usr/sbin:/sbin:${bindir}",
         "/path/to/scp.real" => "${bindir}/scp.real",
         "/path/to/ssh" => "${bindir}/ssh",
+        "/path/to/sftp.real" => "${bindir}/sftp.real",
+        "/path/to/sshd.real" => "${sbindir}/sshd.real",
+        "/path/to/ssh_config" => "${sysconfdir}/ssh_config",
+        "/path/to/sshd_config" => "${sysconfdir}/sshd_config",
         );
 
     #
@@ -75,6 +80,8 @@ sub fixpaths
 
     @files = (
         "${bindir}/scp",
+        "${bindir}/sftp",
+        "${sbindir}/sshd",
         "${sysconfdir}/ssh_config",
         "${sysconfdir}/sshd_config",
         "${sysconfdir}/moduli",
@@ -148,44 +155,17 @@ sub fixpaths
     return 0;
 }
 
-sub runkeygen
-{
-    print "Generating ssh keys (if necessary)...\n";
-    if ( -e "${sysconfdir}/ssh_host_key" )
-    {
-        print "${sysconfdir}/ssh_host_key already exists, skipping.\n";
-    }
-    else
-    {
-        # if $sysconfdir/ssh_host_key doesn't exist..
-        system("$bindir/ssh-keygen -t rsa1 -f $sysconfdir/ssh_host_key -N \"\"");
-    }
-
-    if ( -e "${sysconfdir}/ssh_host_dsa_key" )
-    {
-        print "${sysconfdir}/ssh_host_dsa_key already exists, skipping.\n";
-    }
-    else
-    {
-        # if $sysconfdir/ssh_host_dsa_key doesn't exist..
-        system("$bindir/ssh-keygen -t dsa -f $sysconfdir/ssh_host_dsa_key -N \"\"");
-    }
-
-    if ( -e "${sysconfdir}/ssh_host_rsa_key" )
-    {
-        print "${sysconfdir}/ssh_host_rsa_key already exists, skipping.\n";
-    }
-    else
-    {
-        # if $sysconfdir/ssh_host_rsa_key doesn't exist..
-        system("$bindir/ssh-keygen -t rsa -f $sysconfdir/ssh_host_rsa_key -N \"\"");
-    }
-
-    return 0;
-}
-
 fixpaths();
-runkeygen();
+
+print "---------------------------------------------------------------------\n";
+print "If you would also like to run the sshd binary that came with this\n";
+print "package and you do not have host keys located in /etc, run (as root):\n";
+print "\n";
+print "  $setupdir/setup-openssh-keys\n";
+print "\n";
+print "This script creates machine-specific host keys in /etc that are\n";
+print "required by sshd.\n";
+print "---------------------------------------------------------------------\n";
 
 my $metadata = new Grid::GPT::Setup(package_name => "gsi_openssh_setup");