Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dCache
cta
Commits
2f320805
Commit
2f320805
authored
9 years ago
by
Steven Murray
Browse files
Options
Downloads
Patches
Plain Diff
CASTOR-5093 RFE: Change default location of /opt/xrootd/keys/key.pem to /etc/castor/key.pem
Fixed.
parent
dd9e7867
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
castor/castor.conf
+1
-1
1 addition, 1 deletion
castor/castor.conf
castor/scheduler/diskmanager/xrootiface.py
+1
-1
1 addition, 1 deletion
castor/scheduler/diskmanager/xrootiface.py
with
2 additions
and
2 deletions
castor/castor.conf
+
1
−
1
View file @
2f320805
...
...
@@ -385,7 +385,7 @@
#XROOT TIMEOUT 300
# The file hosting the Xroot private key, needed to sign Xroot URLs
#XROOT PrivateKey /
opt/xrootd/keys
/key.pem
#XROOT PrivateKey /
etc/castor
/key.pem
#
# RFIO/RFIOD
...
...
This diff is collapsed.
Click to expand it.
castor/scheduler/diskmanager/xrootiface.py
+
1
−
1
View file @
2f320805
...
...
@@ -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
'
,
'
/
opt/xrootd/keys
/key.pem
'
)
keyFile
=
config
.
getValue
(
'
XROOT
'
,
'
PrivateKey
'
,
'
/
etc/castor
/key.pem
'
)
key
=
RSA
.
importKey
(
open
(
keyFile
,
'
r
'
).
read
())
# sign opaque part obtained by concatenating the values
opaque_token
=
''
.
join
([
opaque_dict
[
'
castor.pfn1
'
],
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment