Skip to content

Commit 0e21287

Browse files
committed
Upgrade to xrdcl-pelican v1.3.1
xrdcl-pelican splits pelican:// and https:// into two different plugins (the former relies on the latter); this includes corresponding changes to the plugin configuration generation.
1 parent aafdbbb commit 0e21287

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

images/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ ARG NODEJS_VER=20
5353
#
5454
ARG LOTMAN_SRC_BUILD=false
5555
ARG LOTMAN_VER=0.0.4
56-
ARG XRDCL_PELICAN_SRC_BUILD=false
57-
ARG XRDCL_PELICAN_VER=1.2.3
56+
ARG XRDCL_PELICAN_SRC_BUILD=true
57+
ARG XRDCL_PELICAN_VER=1.3.1
5858
ARG XRDHTTP_PELICAN_SRC_BUILD=false
5959
ARG XRDHTTP_PELICAN_VER=0.0.6
6060
ARG XROOTD_LOTMAN_SRC_BUILD=false

xrootd/xrootd_config.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,24 @@ const (
7272
url = pelican://*
7373
lib = libXrdClPelican.so
7474
enable = true
75+
`
76+
77+
clientHttpPluginDefault = `
78+
url = http://*;https://*
79+
lib = libXrdClCurl.so
80+
enable = true
7581
`
7682

7783
clientPluginMac = `
7884
url = pelican://*
7985
lib = libXrdClPelican.dylib
8086
enable = true
87+
`
88+
89+
clientHttpPluginMac = `
90+
url = http://*;https://*
91+
lib = libXrdClCurl.dylib
92+
enable = true
8193
`
8294
)
8395

@@ -459,8 +471,10 @@ func CheckXrootdEnv(server server_structs.XRootDServer) error {
459471
}
460472
if runtime.GOOS == "darwin" {
461473
err = os.WriteFile(filepath.Join(clientPluginsDir, "pelican-plugin.conf"), []byte(clientPluginMac), os.FileMode(0644))
474+
err = os.WriteFile(filepath.Join(clientPluginsDir, "http-plugin.conf"), []byte(clientHttpPluginMac), os.FileMode(0644))
462475
} else {
463476
err = os.WriteFile(filepath.Join(clientPluginsDir, "pelican-plugin.conf"), []byte(clientPluginDefault), os.FileMode(0644))
477+
err = os.WriteFile(filepath.Join(clientPluginsDir, "http-plugin.conf"), []byte(clientHttpPluginDefault), os.FileMode(0644))
464478
}
465479
if err != nil {
466480
return errors.Wrap(err, "Unable to configure cache client plugin")

0 commit comments

Comments
 (0)