From e2891d6d1c33906e279c6dc0db92eff8dc2c8f9a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ji=C5=99=C3=AD=20Filipovi=C4=8D?= Date: Wed, 25 Jun 2008 12:48:43 +0000 Subject: [PATCH] Use new ftp daemon with new authorization plugin. --- org.glite.jp.primary/config/functions/config_glite_jpps | 2 +- org.glite.jp.primary/config/gsi_authz.conf.example | 6 ++++++ org.glite.jp.primary/config/site-info.def.example | 3 +++ org.glite.jp.primary/config/startup | 13 +++++++------ 4 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 org.glite.jp.primary/config/gsi_authz.conf.example diff --git a/org.glite.jp.primary/config/functions/config_glite_jpps b/org.glite.jp.primary/config/functions/config_glite_jpps index e57ff96..d4368b4 100644 --- a/org.glite.jp.primary/config/functions/config_glite_jpps +++ b/org.glite.jp.primary/config/functions/config_glite_jpps @@ -17,7 +17,7 @@ function config_glite_jpps_setenv(){ yaimgridenv_set GLITE_JP_PRIMARY_EXTERNAL gsiftp://`hostname -f`:${GLITE_JP_PRIMARY_FTP_PORT:-8911}${GLITE_USER_HOME:-/home/glite}/jpps yaimgridenv_set GLITE_JP_PRIMARY_DBCS ${GLITE_JP_PRIMARY_DBCS:-jpps/@localhost:jpps} yaimgridenv_set GLITE_JP_PRIMARY_SPECIAL ${GLITE_JP_PRIMARY_SPECIAL:-} - + yaimgridenv_set GLITE_JP_GSI_AUTHZ ${GLITE_JP_GSI_AUTHZ:-$GLITE_LOCATION/etc/gsi_authz.conf} yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/glite/lib yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/globus/lib diff --git a/org.glite.jp.primary/config/gsi_authz.conf.example b/org.glite.jp.primary/config/gsi_authz.conf.example new file mode 100644 index 0000000..2ef1733 --- /dev/null +++ b/org.glite.jp.primary/config/gsi_authz.conf.example @@ -0,0 +1,6 @@ +GLOBUS_GSI_AUTHZ_SYSTEM_INIT glite-jp-callouts_gcc64 authz_jp_system_init_callout +GLOBUS_GSI_AUTHZ_SYSTEM_DESTROY glite-jp-callouts_gcc64 authz_jp_system_destroy_callout +GLOBUS_GSI_AUTHZ_HANDLE_INIT glite-jp-callouts_gcc64 authz_jp_handle_init_callout +GLOBUS_GSI_AUTHZ_HANDLE_DESTROY glite-jp-callouts_gcc64 authz_jp_handle_destroy_callout +GLOBUS_GSI_AUTHORIZE_ASYNC glite-jp-callouts_gcc64 authz_jp_authorize_async_callout +globus_mapping glite-jp-callouts_gcc64 authz_jp_globus_mapping diff --git a/org.glite.jp.primary/config/site-info.def.example b/org.glite.jp.primary/config/site-info.def.example index f9757fd..1a297d4 100755 --- a/org.glite.jp.primary/config/site-info.def.example +++ b/org.glite.jp.primary/config/site-info.def.example @@ -50,6 +50,9 @@ MYSQL_PASSWORD=set_this_to_a_good_password # FTP port #GLITE_JP_PRIMARY_FTP_PORT=8911 +#FTP authz configuration file +#GLITE_JP_GSI_AUTHZ=$GLITE_LOCATION/etc/gsi_authz.conf + # List of privileged DN subjects #GLITE_JP_PRIMARY_PEERS=$GLITE_LOCATION/etc/JPPS-peers diff --git a/org.glite.jp.primary/config/startup b/org.glite.jp.primary/config/startup index bf43d4a..e3d3dec 100644 --- a/org.glite.jp.primary/config/startup +++ b/org.glite.jp.primary/config/startup @@ -77,12 +77,13 @@ start() echo -n Starting JP gridftp server ... su - $GLITE_USER -c "X509_USER_CERT=\"$X509_USER_CERT\" \ - X509_USER_KEY=\"$X509_USER_KEY\" \ - GLITE_USER=\"$GLITE_USER\" \ - FTPBE_INT_PREFIX=\"$GLITE_JP_PRIMARY_INTERNAL\" \ - LD_LIBRARY_PATH=$GLOBUS_LOCATION/lib \ - LD_PRELOAD=$GLITE_LOCATION/lib/glite-jp-ftpdauth.so \ - $GLOBUS_LOCATION/sbin/in.ftpd -Q -W -a -s -p $GLITE_JP_PRIMARY_FTP_PORT & \ + X509_USER_KEY=\"$X509_USER_KEY\" \ + GLITE_USER=\"$GLITE_USER\" \ + FTPBE_INT_PREFIX=\"$GLITE_JP_PRIMARY_INTERNAL\" \ + LD_LIBRARY_PATH=$GLOBUS_LOCATION/lib \ + FTPBE_DB_CS=$GLITE_JP_PRIMARY_DBCS \ + GSI_AUTHZ_CONF=$GLITE_JP_GSI_AUTHZ \ + $GLOBUS_LOCATION/sbin/globus-gridftp-server -debug -s -p $GLITE_JP_PRIMARY_FTP_PORT & \ pid=\$!; echo \$pid > $pidfile.ftpd; sleep 2; true kill -0 \$pid" && echo " done" || echo " FAILED" } -- 1.8.2.3