|
 |
e71e831 |
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper globus_gatekeeper_setup-2.2/setup-globus-gatekeeper
|
|
|
e71e831 |
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper 2004-03-04 21:13:19.000000000 +0100
|
|
|
e71e831 |
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper 2009-07-31 22:34:30.738499397 +0200
|
|
|
e71e831 |
@@ -1,3 +1,3 @@
|
|
|
e71e831 |
#! /bin/sh
|
|
|
e71e831 |
|
|
|
e71e831 |
-perl $GLOBUS_LOCATION/setup/globus/setup-globus-gatekeeper.pl "$@"
|
|
|
e71e831 |
+perl ${GLOBUS_LOCATION:-/usr}/setup/globus/setup-globus-gatekeeper.pl "$@"
|
|
|
e71e831 |
diff -ur globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl
|
|
|
e71e831 |
--- globus_gatekeeper_setup-2.2.orig/setup-globus-gatekeeper.pl 2004-03-04 21:13:19.000000000 +0100
|
|
|
e71e831 |
+++ globus_gatekeeper_setup-2.2/setup-globus-gatekeeper.pl 2009-08-04 20:42:25.015218865 +0200
|
|
|
e71e831 |
@@ -4,12 +4,7 @@
|
|
|
e71e831 |
|
|
|
e71e831 |
if (!defined($gpath))
|
|
|
e71e831 |
{
|
|
|
e71e831 |
- $gpath = $ENV{GLOBUS_LOCATION};
|
|
|
e71e831 |
-}
|
|
|
e71e831 |
-
|
|
|
e71e831 |
-if (!defined($gpath))
|
|
|
e71e831 |
-{
|
|
|
e71e831 |
- die "GPT_LOCATION or GLOBUS_LOCATION needs to be set before running this script"
|
|
|
e71e831 |
+ $gpath = "/usr";
|
|
|
e71e831 |
}
|
|
|
e71e831 |
|
|
|
e71e831 |
@INC = (@INC, "$gpath/lib/perl");
|
|
|
e71e831 |
@@ -50,9 +45,9 @@
|
|
|
e71e831 |
|
|
|
e71e831 |
my $metadata = new Grid::GPT::Setup(package_name => "globus_gatekeeper_setup");
|
|
|
e71e831 |
|
|
|
e71e831 |
-my $globusdir = $ENV{GLOBUS_LOCATION};
|
|
|
e71e831 |
-my $setupdir = "$globusdir/setup/globus/";
|
|
|
e71e831 |
-my $gk_conf = "$globusdir/etc/globus-gatekeeper.conf";
|
|
|
e71e831 |
+use Globus::Core::Path;
|
|
|
e71e831 |
+
|
|
|
e71e831 |
+my $gk_conf = "$Globus::Core::Path::sysconfdir/globus-gatekeeper.conf";
|
|
|
e71e831 |
|
|
|
e71e831 |
print "Creating gatekeeper configuration file...\n";
|
|
|
e71e831 |
|
|
|
e71e831 |
@@ -66,27 +61,26 @@
|
|
|
e71e831 |
-x509_user_cert $x509_user_cert
|
|
|
e71e831 |
-x509_user_key $x509_user_key
|
|
|
e71e831 |
-gridmap $gridmap
|
|
|
e71e831 |
- -home $globusdir
|
|
|
e71e831 |
- -e libexec
|
|
|
e71e831 |
- -logfile var/globus-gatekeeper.log
|
|
|
e71e831 |
+ -e $Globus::Core::Path::sbindir
|
|
|
e71e831 |
+ -logfile $Globus::Core::Path::localstatedir/log/globus-gatekeeper.log
|
|
|
e71e831 |
-port 2119
|
|
|
e71e831 |
- -grid_services etc/grid-services
|
|
|
e71e831 |
+ -grid_services $Globus::Core::Path::sysconfdir/grid-services
|
|
|
e71e831 |
-inetd
|
|
|
e71e831 |
EOF
|
|
|
e71e831 |
|
|
|
e71e831 |
print "Done\n";
|
|
|
e71e831 |
|
|
|
e71e831 |
-if ( ! -d "$globusdir/var" )
|
|
|
e71e831 |
+if ( ! -d "$Globus::Core::Path::localstatedir/log" )
|
|
|
e71e831 |
{
|
|
|
e71e831 |
print "Creating gatekeeper log directory...\n";
|
|
|
e71e831 |
- system "mkdir -p $globusdir/var";
|
|
|
e71e831 |
+ system "mkdir -p $Globus::Core::Path::localstatedir/log";
|
|
|
e71e831 |
print "Done\n";
|
|
|
e71e831 |
}
|
|
|
e71e831 |
|
|
|
e71e831 |
-if ( ! -d "$globusdir/etc/grid-services" )
|
|
|
e71e831 |
+if ( ! -d "$Globus::Core::Path::sysconfdir/grid-services" )
|
|
|
e71e831 |
{
|
|
|
e71e831 |
print "Creating grid services directory...\n";
|
|
|
e71e831 |
- system "mkdir -p $globusdir/etc/grid-services";
|
|
|
e71e831 |
+ system "mkdir -p $Globus::Core::Path::sysconfdir/grid-services";
|
|
|
e71e831 |
print "Done\n";
|
|
|
e71e831 |
}
|
|
|
e71e831 |
|