Skip to content

Commit b63c9b9

Browse files
matyasselmecibrianhlin
authored andcommitted
Add osg-sysconfig patch
1 parent 558a7a2 commit b63c9b9

3 files changed

Lines changed: 4 additions & 44 deletions

File tree

conf/gridftp-hdfs-environment

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,6 @@ export CLASSPATH=$CLASSPATH
6767

6868
unset IFS
6969

70-
# Configurations for the authz
71-
# Only applies to the root user due to ownership issues
72-
if [ $UID -eq 0 ]; then
73-
# Set defaults if they're not already available
74-
# LCAS configuration
75-
export LCAS_LOG_LEVEL=${LCAS_LOG_LEVEL:=0}
76-
export LCAS_DEBUG_LEVEL=${LCAS_DEBUG_LEVEL:=0}
77-
export LCAS_DB_FILE=${LCAS_DB_FILE:=/etc/lcas/lcas.db}
78-
export LCAS_DIR=${LCAS_DIR:=/etc/lcas}
79-
export LCAS_MOD_HOME=${LCAS_MOD_HOME:=/usr/lib64/modules}
80-
81-
# LCMAPS configuration
82-
export LCMAPS_LOG_LEVEL=${LCMAPS_LOG_LEVEL:=0}
83-
export LCMAPS_DEBUG_LEVEL=${LCMAPS_DEBUG_LEVEL:=0}
84-
export LCMAPS_DB_FILE=${LCMAPS_DB_FILE:=/etc/lcmaps.db}
85-
export LCMAPS_DIR=${LCMAPS_DIR:=/etc/lcmaps}
86-
export LCMAPS_MOD_HOME=${LCMAPS_MOD_HOME:=/usr/lib64/modules}
87-
export LCMAPS_POLICY_NAME=${LCMAPS_POLICY_NAME:=globus_gridftp_mapping}
88-
fi
89-
9070
# New gridftp.conf override in GT 5.2
9171
#export GRIDFTP_CONF=/etc/gridftp-hdfs/gridftp.conf
9272
export conf=/etc/gridftp-hdfs/gridftp.conf

scripts/gridftp-hdfs-standalone.in

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
1-
#!/bin/sh
1+
#!/bin/sh
22

3-
if [ -e @datadir_resolved@/gridftp-hdfs/gridftp-hdfs-environment ] ; then
4-
. @datadir_resolved@/gridftp-hdfs/gridftp-hdfs-environment
5-
fi
6-
7-
if [ -e @sysconfdir_resolved@/gridftp-hdfs/gridftp-hdfs-local.conf ] ; then
8-
. @sysconfdir_resolved@/gridftp-hdfs/gridftp-hdfs-local.conf
9-
fi
10-
11-
if [ -e @sysconfdir_resolved@/sysconfig/gridftp-hdfs ] ; then
12-
. @sysconfdir_resolved@/sysconfig/gridftp-hdfs
13-
fi
3+
. /usr/share/osg/sysconfig/globus-gridftp-server-plugin
144

155
export CLASSPATH=$CLASSPATH
16-
6+
177
exec /usr/sbin/globus-gridftp-server -c @sysconfdir_resolved@/gridftp-hdfs/gridftp-debug.conf -dsi hdfs -no-fork
188

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
#!/bin/sh
22

3-
if [ -e @datadir_resolved@/gridftp-hdfs/gridftp-hdfs-environment ] ; then
4-
. @datadir_resolved@/gridftp-hdfs/gridftp-hdfs-environment
5-
fi
6-
7-
if [ -e @sysconfdir_resolved@/gridftp-hdfs/gridftp-hdfs-local.conf ] ; then
8-
. @sysconfdir_resolved@/gridftp-hdfs/gridftp-hdfs-local.conf
9-
fi
10-
11-
if [ -e @sysconfdir_resolved@/sysconfig/gridftp-hdfs ] ; then
12-
. @sysconfdir_resolved@/sysconfig/gridftp-hdfs
13-
fi
3+
. /usr/share/osg/sysconfig/globus-gridftp-server-plugin
144

155
exec /usr/sbin/globus-gridftp-server -c @sysconfdir_resolved@/gridftp-hdfs/gridftp-inetd.conf -dsi hdfs
166

0 commit comments

Comments
 (0)