Commit b745a9cf authored by Daniele Kruse's avatar Daniele Kruse
Browse files

fixes for conf files

parent e3899294
...@@ -84,7 +84,7 @@ std::string encode(const std::string msg) { ...@@ -84,7 +84,7 @@ std::string encode(const std::string msg) {
* @return the command string * @return the command string
*/ */
std::string formatCommandPath(const int argc, const char **argv) { std::string formatCommandPath(const int argc, const char **argv) {
cta::common::Configuration ctaConf("/etc/cta-cli.conf"); cta::common::Configuration ctaConf("/etc/cta/cta-cli.conf");
std::string cmdPath = "root://"+ctaConf.getConfEntString("Frontend", "HostAndPort", nullptr)+"//"; std::string cmdPath = "root://"+ctaConf.getConfEntString("Frontend", "HostAndPort", nullptr)+"//";
for(int i=0; i<argc; i++) { for(int i=0; i<argc; i++) {
if(i) cmdPath += "&"; if(i) cmdPath += "&";
......
...@@ -1971,7 +1971,7 @@ void XrdCtaFile::xCom_archive() { ...@@ -1971,7 +1971,7 @@ void XrdCtaFile::xCom_archive() {
request.srcURL=srcurl.value(); request.srcURL=srcurl.value();
request.storageClass=storageclass.value(); request.storageClass=storageclass.value();
uint64_t archiveFileId = m_scheduler->queueArchive(m_cliIdentity.username, request); uint64_t archiveFileId = m_scheduler->queueArchive(m_cliIdentity.username, request);
cmdlineOutput << archiveFileId << std::endl; cmdlineOutput << "<eos::wfe::fxattr:archiveFileId>" << archiveFileId << std::endl;
logRequestAndSetCmdlineResult(cta::common::dataStructures::FrontendReturnCode::ok, cmdlineOutput.str()); logRequestAndSetCmdlineResult(cta::common::dataStructures::FrontendReturnCode::ok, cmdlineOutput.str());
} }
......
...@@ -7,11 +7,11 @@ xrootd.seclib libXrdSec.so ...@@ -7,11 +7,11 @@ xrootd.seclib libXrdSec.so
# Protocol specification # Protocol specification
# The xroot server process needs to be able to read the keytab file # The xroot server process needs to be able to read the keytab file
sec.protocol krb5 /etc/krb5.keytab.cta host/<host>@CERN.CH sec.protocol krb5 /etc/krb5.keytab.cta host/<host>@CERN.CH
sec.protocol sss sec.protocol sss -s /var/spool/xrootd/.xrd/sss.keytab
# Only Kerberos 5 and sss are allowed # Only Kerberos 5 and sss are allowed
sec.protbind * only krb5 sec.protbind * only sss
sec.protbind tpsrv* only sss sec.protbind tpsrv* only krb5
# Allow copying from absolute paths # Allow copying from absolute paths
all.export / all.export /
......
Supports Markdown
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