From ae7f8fc266a9aaf1c4dbcb8e4ee0db094ac6edf5 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 16 Jun 2020 06:32:17 +0200 Subject: [PATCH 1/2] Don't use versioned plugin names in configuration --- packaging/common/xrootd-http.cfg | 2 +- src/XrdHttp/xrootd-http-rdr.cf | 2 +- src/XrdHttp/xrootd-http.cf | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/common/xrootd-http.cfg b/packaging/common/xrootd-http.cfg index 9eb46dc0428..a3fe669af4f 100644 --- a/packaging/common/xrootd-http.cfg +++ b/packaging/common/xrootd-http.cfg @@ -33,7 +33,7 @@ all.pidpath /var/run/xrootd # In order to start the xrdhttp.socket run: # systemctl start xrdhttp@http.socket # -xrd.protocol XrdHttp:80 /usr/lib64/libXrdHttp-4.so +xrd.protocol XrdHttp:80 /usr/lib64/libXrdHttp.so # More configuration files can be added in /etc/xrootd/config.d/ # For example /etc/xrootd/config.d/10-mygrid.cfg and # /etc/xrootd/config.d/98-mysite-specifics.cfg diff --git a/src/XrdHttp/xrootd-http-rdr.cf b/src/XrdHttp/xrootd-http-rdr.cf index 001d62dea67..08b92c74e9d 100644 --- a/src/XrdHttp/xrootd-http-rdr.cf +++ b/src/XrdHttp/xrootd-http-rdr.cf @@ -5,7 +5,7 @@ if exec xrootd - xrd.protocol XrdHttp /usr/lib64/libXrdHttp.so.1 + xrd.protocol XrdHttp /usr/lib64/libXrdHttp.so fi # Regular SSL stuff ... adjust as needed diff --git a/src/XrdHttp/xrootd-http.cf b/src/XrdHttp/xrootd-http.cf index bd6b839fcf9..0ea00d100c1 100644 --- a/src/XrdHttp/xrootd-http.cf +++ b/src/XrdHttp/xrootd-http.cf @@ -7,7 +7,7 @@ if exec xrootd - xrd.protocol XrdHttp /usr/local/lib/libXrdHttp-4.so + xrd.protocol XrdHttp /usr/lib64/libXrdHttp.so fi http.cert /etc/grid-security/hostcert.pem @@ -15,7 +15,7 @@ http.key /etc/grid-security/hostkey.pem http.cadir /etc/grid-security/certificates #http.secretkey CHANGEME #http.gridmap /etc/grid-security/mapfile -#http.secxtractor /usr/lib64/libXrdHttpVOMS-4.so +#http.secxtractor /usr/lib64/libXrdHttpVOMS.so #http.selfhttps2http yes # As an example of preloading files, let's preload in memory From 346fc329cab84a9e53ca7eb0f699047534647c9e Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 16 Jun 2020 06:37:10 +0200 Subject: [PATCH 2/2] Use "pss.cachelib default" in the filecache configuration files This way the config files can be used by both the xrootd 5 server and the xrootd 4 server provided by the xrootd-compat package --- packaging/common/xrootd-filecache-clustered.cfg | 2 +- packaging/common/xrootd-filecache-standalone.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/common/xrootd-filecache-clustered.cfg b/packaging/common/xrootd-filecache-clustered.cfg index af269771a07..ae83b406f9b 100644 --- a/packaging/common/xrootd-filecache-clustered.cfg +++ b/packaging/common/xrootd-filecache-clustered.cfg @@ -67,7 +67,7 @@ all.role server # For xrootd, load the proxy plugin and the disk caching plugin. # ofs.osslib libXrdPss.so -pss.cachelib libXrdPfc.so +pss.cachelib default # The server needs to write to disk, stage not relevant # diff --git a/packaging/common/xrootd-filecache-standalone.cfg b/packaging/common/xrootd-filecache-standalone.cfg index 793d0e1a301..b1eeb48d553 100644 --- a/packaging/common/xrootd-filecache-standalone.cfg +++ b/packaging/common/xrootd-filecache-standalone.cfg @@ -20,7 +20,7 @@ all.export /test/ # Load the proxy plugin and the disk caching plugin. # ofs.osslib libXrdPss.so -pss.cachelib libXrdPfc.so +pss.cachelib default # Tell the proxy where the data is coming from (arbitrary). #