Commit 396ed568 authored by Daniele Kruse's avatar Daniele Kruse
Browse files

Separated the conf files for frontend and CLI. Fixed order of auth in the...

Separated the conf files for frontend and CLI. Fixed order of auth in the xroot conf file. Fixed cta-cli RPM.
parent 306ec560
......@@ -24,5 +24,6 @@ include_directories (${XROOTD_INCLUDE_DIR} ${XROOTD_PRIVATE_INCLUDE_DIR} ${CMAKE
add_executable (cta CTACmdMain.cpp)
target_link_libraries (cta ${XROOTD_XRDCL_LIB} ctacommon cryptopp ctautils)
install (TARGETS cta DESTINATION usr/bin)
INSTALL (FILES cta-cli.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
include_directories (${CMAKE_SOURCE_DIR}/tapeserver/)
......@@ -84,7 +84,7 @@ std::string encode(const std::string msg) {
* @return the command string
*/
std::string formatCommandPath(const int argc, const char **argv) {
cta::common::Configuration ctaConf("/etc/cta/cta-frontend.conf");
cta::common::Configuration ctaConf("/etc/cta-cli.conf");
std::string cmdPath = "root://"+ctaConf.getConfEntString("Frontend", "HostAndPort", NULL)+"//";
for(int i=0; i<argc; i++) {
if(i) cmdPath += "&";
......
Frontend HostAndPort <host>.cern.ch:10955
\ No newline at end of file
......@@ -76,7 +76,7 @@ cd build
%{__make} shortunittests
%endif
# The packages will be cta-tapeserver, cta-frontend, cta-cli
# The packages will be cta-taped, cta-frontend, cta-cli
%package -n cta-taped
Summary: CERN Tape Archive: tape daemon
......@@ -100,17 +100,21 @@ The xroot plugin
%files -n cta-frontend
%defattr(-,root,root)
%attr(0755,root,root) %{_libdir}/libXrdCtaOfs.so
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/xrd.cf.cta
%attr(0644,root,root) %config(noreplace) /etc/xrootd/xrootd-cta.cfg
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta-frontend.conf
%package -n cta-cli
Summary: CERN Tape Archive: command line interface
Group: Application/CTA
requires: xrootd >= 4.3
%description -n cta-cli
CERN Tape Archive:
The xroot plugin
%files -n cta-cli
%defattr(-,root,root)
%attr(0755,root,root) %{_libdir}/libctacommon.so
%attr(0755,root,root) %{_bindir}/cta
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta-cli.conf
%package -n cta-lib
Summary: CERN Tape Archive
......@@ -134,16 +138,6 @@ The shared libraries
%attr(0755,root,root) %{_libdir}/libctatapeserverdaemonutils.so
%attr(0644,root,root) %{_sysconfdir}/cta/cta_catalogue_db.conf.example
%package -n cta-client-lib
Summary: CERN Tape Archive
Group: Application/CTA
%description -n cta-client-lib
CERN Tape Archive:
The client libraries
%files -n cta-client-lib
%defattr(-,root,root)
%attr(0755,root,root) %{_libdir}/libctacommon.so
%package -n cta-doc
Summary: CERN Tape Archive: Documents and supporting SQL scripts
Group: Application/CTA
......
......@@ -11,4 +11,5 @@ add_library (XrdCtaOfs MODULE XrdCtaFilesystem.cpp XrdCtaFile.cpp XrdCtaDir.cpp)
target_link_libraries (XrdCtaOfs ctacatalogue ctascheduler ctacommon ctaremotens protobuf ctaobjectstore cryptopp)
INSTALL (TARGETS XrdCtaOfs DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
INSTALL (FILES xrd.cf.cta DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
INSTALL (FILES xrootd-cta.cfg DESTINATION /etc/xrootd/)
INSTALL (FILES cta-frontend.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
ObjectStore BackendPath /tmp/jobStoreXXXXXXX
\ No newline at end of file
......@@ -10,8 +10,8 @@ sec.protocol krb5 /etc/krb5.keytab.cta host/<host>@CERN.CH
sec.protocol sss
# Only Kerberos 5 and sss are allowed
sec.protbind tpsrv* only sss
sec.protbind * only krb5
sec.protbind tpsrv* only sss
# Allow copying from absolute paths
all.export /
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment