Merge pull request #12 from brianhlin/osg-sysconfig

Add OSG sysconfig files

Author: bbockelm

conf/Makefile.am

@@ -8,3 +8,6 @@ dist_sysconfig_DATA = gridftp-hdfs gridftp-hdfs-environment-bootstrap
 envdir = $(datadir)/gridftp-hdfs
 dist_env_DATA = gridftp-hdfs-environment
 
+osgsysconfigdir = $(datadir)/osg/sysconfig
+dist_osgsysconfig_DATA = globus-gridftp-server-plugin
+

conf/globus-gridftp-server-plugin

@@ -0,0 +1,7 @@
+# gridftp-hdfs plugin for setting environment in globus-gridftp-server
+
+. /usr/share/gridftp-hdfs/gridftp-hdfs-environment
+
+if [ -e /etc/sysconfig/gridftp-hdfs ]; then
+    . /etc/sysconfig/gridftp-hdfs
+fi

conf/gridftp-hdfs-environment

@@ -67,26 +67,6 @@ export CLASSPATH=$CLASSPATH
 
 unset IFS
 
-# Configurations for the authz
-# Only applies to the root user due to ownership issues
-if [ $UID -eq 0 ]; then
-  # Set defaults if they're not already available
-  # LCAS configuration
-  export LCAS_LOG_LEVEL=${LCAS_LOG_LEVEL:=0}
-  export LCAS_DEBUG_LEVEL=${LCAS_DEBUG_LEVEL:=0}
-  export LCAS_DB_FILE=${LCAS_DB_FILE:=/etc/lcas/lcas.db}
-  export LCAS_DIR=${LCAS_DIR:=/etc/lcas}
-  export LCAS_MOD_HOME=${LCAS_MOD_HOME:=/usr/lib64/modules}
- 
-  # LCMAPS configuration
-  export LCMAPS_LOG_LEVEL=${LCMAPS_LOG_LEVEL:=0}
-  export LCMAPS_DEBUG_LEVEL=${LCMAPS_DEBUG_LEVEL:=0}
-  export LCMAPS_DB_FILE=${LCMAPS_DB_FILE:=/etc/lcmaps.db}
-  export LCMAPS_DIR=${LCMAPS_DIR:=/etc/lcmaps}
-  export LCMAPS_MOD_HOME=${LCMAPS_MOD_HOME:=/usr/lib64/modules}
-  export LCMAPS_POLICY_NAME=${LCMAPS_POLICY_NAME:=globus_gridftp_mapping}
-fi
-
 # New gridftp.conf override in GT 5.2
 #export GRIDFTP_CONF=/etc/gridftp-hdfs/gridftp.conf
 export conf=/etc/gridftp-hdfs/gridftp.conf

scripts/gridftp-hdfs-standalone.in

@@ -1,18 +1,9 @@
-#!/bin/sh                                                            
+#!/bin/sh
 
-if [ -e @datadir_resolved@/gridftp-hdfs/gridftp-hdfs-environment ] ; then
-    . @datadir_resolved@/gridftp-hdfs/gridftp-hdfs-environment
-fi
-
-if [ -e @sysconfdir_resolved@/gridftp-hdfs/gridftp-hdfs-local.conf ] ; then
-    . @sysconfdir_resolved@/gridftp-hdfs/gridftp-hdfs-local.conf
-fi
-
-if [ -e @sysconfdir_resolved@/sysconfig/gridftp-hdfs ] ; then
-    . @sysconfdir_resolved@/sysconfig/gridftp-hdfs
-fi
+OSG_CONFIG= /usr/share/osg/sysconfig/globus-gridftp-server-plugin
+[ -e $OSG_CONFIG ] && . $OSG_CONFIG
 
 export CLASSPATH=$CLASSPATH
-                                                                      
+
 exec /usr/sbin/globus-gridftp-server -c @sysconfdir_resolved@/gridftp-hdfs/gridftp-debug.conf -dsi hdfs -no-fork
 

scripts/xinetd/gridftp-hdfs-inetd.in

@@ -1,16 +1,7 @@
 #!/bin/sh
 
-if [ -e @datadir_resolved@/gridftp-hdfs/gridftp-hdfs-environment ] ; then
-    . @datadir_resolved@/gridftp-hdfs/gridftp-hdfs-environment
-fi
-
-if [ -e @sysconfdir_resolved@/gridftp-hdfs/gridftp-hdfs-local.conf ] ; then
-    . @sysconfdir_resolved@/gridftp-hdfs/gridftp-hdfs-local.conf
-fi
-
-if [ -e @sysconfdir_resolved@/sysconfig/gridftp-hdfs ] ; then
-    . @sysconfdir_resolved@/sysconfig/gridftp-hdfs
-fi
+OSG_CONFIG= /usr/share/osg/sysconfig/globus-gridftp-server-plugin
+[ -e $OSG_CONFIG ] && . $OSG_CONFIG
 
 exec /usr/sbin/globus-gridftp-server -c @sysconfdir_resolved@/gridftp-hdfs/gridftp-inetd.conf -dsi hdfs