diff --git a/cta.spec.in b/cta.spec.in index 3cbde302f1a4598023216ae22504b53c66cd3b21..980132934869badf897fa52ac0ae875f127ae405 100644 --- a/cta.spec.in +++ b/cta.spec.in @@ -157,7 +157,6 @@ The xroot plugin /usr/bin/getent passwd cta || /usr/sbin/useradd -s /bin/nologin -c "CTA system account" -g cta cta %files -n cta-frontend %defattr(0755,root,root) -%{_libdir}/libXrdCtaOfs.so* %{_libdir}/libXrdSsiCta.so* %attr(0755,cta,cta) %dir /var/log/cta %attr(0644,root,root) %config(noreplace) /etc/logrotate.d/cta-frontend diff --git a/xroot_plugins/CMakeLists.txt b/xroot_plugins/CMakeLists.txt index 00f3d03843ae9b2baa2c6c5ef9fc78b63e0a44a8..671223ef854917c9166bf1e679b41cedd908310f 100644 --- a/xroot_plugins/CMakeLists.txt +++ b/xroot_plugins/CMakeLists.txt @@ -48,27 +48,27 @@ endif (OCCI_SUPPORT) # # XRootD OFS plugin for CTA Frontend (DEPRECATED) # -add_library (XrdCtaOfs MODULE - ListArchiveFilesCmd.cpp - XrdCtaFilesystem.cpp - XrdCtaFile.cpp - XrdCtaDir.cpp) -if(CMAKE_COMPILER_IS_GNUCC) - # Add -Wno-implicit-fallthrough compiler flag if using gcc version 7 or greater - if (GCC_VERSION VERSION_EQUAL 7 OR GCC_VERSION VERSION_GREATER 7) - set_property(SOURCE XrdCtaFile.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-implicit-fallthrough") - endif (GCC_VERSION VERSION_EQUAL 7 OR GCC_VERSION VERSION_GREATER 7) -endif(CMAKE_COMPILER_IS_GNUCC) - -set_property(TARGET XrdCtaOfs PROPERTY SOVERSION "${CTA_SOVERSION}") -set_property(TARGET XrdCtaOfs PROPERTY VERSION "${CTA_LIBVERSION}") -target_link_libraries (XrdCtaOfs ctacatalogue ctascheduler ctacommon ctaobjectstore cryptopp) -set_property (TARGET XrdCtaOfs APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH}) -if (OCCI_SUPPORT) - set_property (TARGET XrdCtaOfs APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH}) -endif (OCCI_SUPPORT) - -install (TARGETS XrdCtaOfs DESTINATION usr/${CMAKE_INSTALL_LIBDIR}) +#add_library (XrdCtaOfs MODULE +# ListArchiveFilesCmd.cpp +# XrdCtaFilesystem.cpp +# XrdCtaFile.cpp +# XrdCtaDir.cpp) +#if(CMAKE_COMPILER_IS_GNUCC) +# # Add -Wno-implicit-fallthrough compiler flag if using gcc version 7 or greater +# if (GCC_VERSION VERSION_EQUAL 7 OR GCC_VERSION VERSION_GREATER 7) +# set_property(SOURCE XrdCtaFile.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-implicit-fallthrough") +# endif (GCC_VERSION VERSION_EQUAL 7 OR GCC_VERSION VERSION_GREATER 7) +#endif(CMAKE_COMPILER_IS_GNUCC) +# +#set_property(TARGET XrdCtaOfs PROPERTY SOVERSION "${CTA_SOVERSION}") +#set_property(TARGET XrdCtaOfs PROPERTY VERSION "${CTA_LIBVERSION}") +#target_link_libraries (XrdCtaOfs ctacatalogue ctascheduler ctacommon ctaobjectstore cryptopp) +#set_property (TARGET XrdCtaOfs APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH}) +#if (OCCI_SUPPORT) +# set_property (TARGET XrdCtaOfs APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH}) +#endif (OCCI_SUPPORT) +# +#install (TARGETS XrdCtaOfs DESTINATION usr/${CMAKE_INSTALL_LIBDIR}) # #################################################################################################### diff --git a/xroot_plugins/cta-frontend-xrootd.conf b/xroot_plugins/cta-frontend-xrootd.conf index 062bbd45e3f42f4bd5be62fa2602557647dd7850..a16ff1431001c385335717881a5c10ab8ac653ea 100644 --- a/xroot_plugins/cta-frontend-xrootd.conf +++ b/xroot_plugins/cta-frontend-xrootd.conf @@ -1,5 +1,6 @@ # Load the CTA SSI and OFS plugins -xrootd.fslib libXrdSsi.so libXrdCtaOfs.so +#xrootd.fslib libXrdSsi.so libXrdCtaOfs.so +xrootd.fslib libXrdSsi.so # Specify which paths are handled by the OFS plugin # @@ -8,10 +9,10 @@ xrootd.fslib libXrdSsi.so libXrdCtaOfs.so # # Y3Rh is the Base64 encoding of cta, so this string appears at the beginning # of all cta admin commands -ssi.fspath /Y3Rh +#ssi.fspath /Y3Rh # L3Vzci9iaW4vY3Rh is Base64 encoding of /usr/bin/cta which appears at # the beginning of commands called from the EOS WFE bash script -ssi.fspath /L3Vzci9iaW4vY3Rh +#ssi.fspath /L3Vzci9iaW4vY3Rh # Load the SSI module ssi.svclib libXrdSsiCta.so @@ -41,5 +42,5 @@ all.export /ctafrontend nolock r/w # There can be more than one of these; anything that starts with the prefix # will go to the the underlying file system. Note that this prefix cannot be # a substring of '/ctafrontend', so it is not possible to simply export '/'. -all.export /Y3Rh -all.export /L3Vzci9iaW4vY3Rh +#all.export /Y3Rh +#all.export /L3Vzci9iaW4vY3Rh