Commit 8d70e1bb authored by Steven Murray's avatar Steven Murray
Browse files

CASTOR-5095 RFE: CASTOR xrootd keys should be prefixed by xrd_

Fixed.
parent f3bc75ee
......@@ -385,7 +385,7 @@
#XROOT TIMEOUT 300
# The file hosting the Xroot private key, needed to sign Xroot URLs
#XROOT PrivateKey /etc/castor/key.pem
#XROOT PrivateKey /etc/castor/xrd_key.pem
#
# RFIO/RFIOD
......@@ -527,7 +527,7 @@
# The file hosting the Xroot private key to be used by tapeseverd to sign Xroot
# URLs.
#TapeServer XrootPrivateKey /etc/castor/tape_key.pem
#TapeServer XrootPrivateKey /etc/castor/xrd_tape_key.pem
# Number of memory buffers in the data-transfer cache.
#TapeServer NbBufs 300
......
......@@ -55,7 +55,7 @@ def buildXrootURL(diskserver, path, transferId, transferType):
'castor.exptime' : str(int(time.time()) + 3600)}
# get Xroot RSA key
keyFile = config.getValue('XROOT', 'PrivateKey', '/etc/castor/key.pem')
keyFile = config.getValue('XROOT', 'PrivateKey', '/etc/castor/xrd_key.pem')
key = RSA.importKey(open(keyFile, 'r').read())
# sign opaque part obtained by concatenating the values
opaque_token = ''.join([opaque_dict['castor.pfn1'],
......
......@@ -83,7 +83,7 @@ castor::tape::tapeserver::daemon::DataTransferConfig
config.remoteFileProtocol = castorConf.getConfEntString(
"TapeServer", "RemoteFileProtocol", "RFIO", log);
config.xrootPrivateKey = castorConf.getConfEntString(
"TapeServer", "XrootPrivateKey", "/etc/castor/tape_key.pem", log);
"TapeServer", "XrootPrivateKey", "/etc/castor/xrd_tape_key.pem", log);
config.moverHandlerPort = castorConf.getConfEntInt(
"DiskManager", "MoverHandlerPort", MOVERHANDLERPORT, log);
......
......@@ -48,7 +48,7 @@ xcastor2.stagermap / default
#-------------------------------------------------------------------------------
xcastor2.targetport 1095
xcastor2.capability true
xcastor2.privatekey /etc/castor/key.pem
xcastor2.privatekey /etc/castor/xrd_key.pem
xcastor2.tokenlocktime 60
xcastor2.proc /var/log/xroot/manager
......
......@@ -21,8 +21,8 @@ ofs.persist off
ofs.authlib /usr/lib64/libxrdxcastor2acc.so.2.1
ofs.authorize
xcastor2.capability true
xcastor2.publickey default /etc/castor/pkey.pem
#xcastor2.publickey tape /etc/castor/tape_pkey.pem
xcastor2.publickey default /etc/castor/xrd_pkey.pem
#xcastor2.publickey tape /etc/castor/xrd_tape_pkey.pem
#-------------------------------------------------------------------------------
# Log level which is the same as the one used by syslog. By default it's INFO.
......
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