diff --git a/configs/atlas-xcache/config.d/50-atlas-xcache-paths.cfg b/configs/atlas-xcache/config.d/50-atlas-xcache-paths.cfg index cbea7a9c..59fb383d 100644 --- a/configs/atlas-xcache/config.d/50-atlas-xcache-paths.cfg +++ b/configs/atlas-xcache/config.d/50-atlas-xcache-paths.cfg @@ -7,10 +7,6 @@ # # This file is part of the ATLAS XCache Daemon -# The directory on local disk where files will be cached, -# e.g. "/mnt/stash/namespace". -oss.localroot $(rootdir)/namespace - # The directories under oss.localroot to share data from. all.export /atlas/rucio all.export /root:/ diff --git a/configs/cms-xcache/config.d/50-cms-xcache-paths.cfg b/configs/cms-xcache/config.d/50-cms-xcache-paths.cfg index 977f4b69..09140910 100644 --- a/configs/cms-xcache/config.d/50-cms-xcache-paths.cfg +++ b/configs/cms-xcache/config.d/50-cms-xcache-paths.cfg @@ -7,9 +7,6 @@ # # This file is part of the CMS XCache Daemon -# The directory on local disk where files will be cached -oss.localroot $(rootdir) - if exec xrootd # The directories under oss.localroot to share data from. all.export /store diff --git a/configs/stash-cache/config.d/40-osg-http.cfg b/configs/stash-cache/config.d/40-osg-http.cfg deleted file mode 100644 index 7a63a506..00000000 --- a/configs/stash-cache/config.d/40-osg-http.cfg +++ /dev/null @@ -1,26 +0,0 @@ -# -# Configure HTTPS for OSG deploys of XRootD. -# -# ********************************************************************** -# * WARNING: DO NOT EDIT THIS FILE. IT WILL BE OVERWRITTEN ON UPGRADE * -# ********************************************************************** -# -# This file is part of the StashCache Daemon -# https://opensciencegrid.org/docs/data/stashcache/overview/ - -if named stash-cache-auth - - xrd.protocol http:8443 libXrdHttp.so - - http.cadir /etc/grid-security/certificates - http.cert /etc/grid-security/xrd/xrdcert.pem - http.key /etc/grid-security/xrd/xrdkey.pem - http.secxtractor /usr/lib64/libXrdLcmaps.so - -else - xrd.protocol http:8000 libXrdHttp.so -fi - -http.listingdeny yes -http.staticpreload http://static/robots.txt /etc/xrootd/xcache-robots.txt - diff --git a/configs/stash-cache/config.d/50-stash-cache-paths.cfg b/configs/stash-cache/config.d/50-stash-cache-paths.cfg index e0004ed2..e04ad273 100644 --- a/configs/stash-cache/config.d/50-stash-cache-paths.cfg +++ b/configs/stash-cache/config.d/50-stash-cache-paths.cfg @@ -8,9 +8,6 @@ # This file is part of the StashCache Daemon # https://opensciencegrid.org/docs/data/stashcache/overview/ -# The directory on local disk where files will be cached, e.g. "/mnt/stash". -oss.localroot $(rootdir) - # The directory under oss.localroot to share data from. # By default, export the entire origin namespace; this may be refined # later in the authorization files. diff --git a/configs/stash-cache/xrootd/xrootd-stash-cache.cfg b/configs/stash-cache/xrootd/xrootd-stash-cache.cfg index 4dcf847f..655bb65a 100644 --- a/configs/stash-cache/xrootd/xrootd-stash-cache.cfg +++ b/configs/stash-cache/xrootd/xrootd-stash-cache.cfg @@ -15,10 +15,12 @@ # https://opensciencegrid.org/docs/data/stashcache/overview/ # - # A few extra configuration settings that have no good other location. +set EnableHttp=1 + if named stash-cache-auth - xrd.port 8443 + set HttpPort=8443 + xrd.port $(HttpPort) else # non-authed stash-cache; the HTTP plugin will also listen on 8000 xrd.port 1094 diff --git a/configs/stash-origin/config.d/50-stash-origin-paths.cfg b/configs/stash-origin/config.d/50-stash-origin-paths.cfg index 1efd18d8..e7f070ae 100644 --- a/configs/stash-origin/config.d/50-stash-origin-paths.cfg +++ b/configs/stash-origin/config.d/50-stash-origin-paths.cfg @@ -8,9 +8,6 @@ # This file is part of the StashCache Daemon # https://opensciencegrid.org/docs/data/stashcache/overview/ -# The directory on local disk containing the files to share, e.g. "/mnt/stash". -oss.localroot $(rootdir) - # The directory under oss.localroot to share data from. # To share multiple subdirectories, have one `all.export` line per # subdirectory; place additional exports in the config.d directory. diff --git a/configs/stash-origin/xrootd/xrootd-stash-origin.cfg b/configs/stash-origin/xrootd/xrootd-stash-origin.cfg index 58d5e4a2..16cfd42b 100644 --- a/configs/stash-origin/xrootd/xrootd-stash-origin.cfg +++ b/configs/stash-origin/xrootd/xrootd-stash-origin.cfg @@ -23,8 +23,11 @@ all.manager redirector.osgstorage.org+ 1213 # A few reasonable defaults for the origin server. +set EnableHttp=1 + if named stash-origin-auth - xrd.port 1095 + set HttpPort=1095 + xrd.port $(HttpPort) else xrd.port 1094 fi diff --git a/configs/xcache/config.d/10-common-site-local.cfg b/configs/xcache/config.d/10-common-site-local.cfg deleted file mode 100644 index 9431c5f4..00000000 --- a/configs/xcache/config.d/10-common-site-local.cfg +++ /dev/null @@ -1,32 +0,0 @@ -# -# Site-provided default values that are necessary for -# variable substitutions in the OSG XCache config files. -# -# ************************************************************ -# * NOTE: Changes to this file will be PRESERVED on upgrades * -# ************************************************************ -# -# This file is part of the XCache packaging - -# You MUST uncomment and fill ALL variables below. -# They have been purposely commented out to cause the server to -# fail to start unless you edit them. - -# A local directory containing files to export from the cache or origin. -# For caches: -# - Must be readable and writeable by the xrootd user. -# - OSG recommends this be at least 1TB. -# For origins: -# - Must be readable by the xrootd user. -# -# set rootdir = /mnt/stash - -# The server name to use for monitoring and reporting; this should -# match the registered resource name in topology.opensciencegrid.org. -# See https://github.com/opensciencegrid/topology/#topology -# -# set resourcename = OSG_RESOURCE_NAME - -# To opt out of OSG monitoring, uncomment the following line: -# -# set DisableOsgMonitoring = 1 diff --git a/configs/xcache/config.d/40-osg-auth.cfg b/configs/xcache/config.d/40-osg-auth.cfg deleted file mode 100644 index 46d2e3c0..00000000 --- a/configs/xcache/config.d/40-osg-auth.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# -# Configure XRootD hosts to utilize the XCache-generated proxy -# -# ********************************************************************** -# * WARNING: DO NOT EDIT THIS FILE. IT WILL BE OVERWRITTEN ON UPGRADE * -# ********************************************************************** -# -# This file is part of the XCache Daemon -# https://opensciencegrid.org/docs/data/stashcache/overview/ - -# Proxy cert for reporting and retrieving data from origin servers -setenv X509_USER_PROXY = /run/xcache-auth/x509_proxy diff --git a/configs/xcache/config.d/40-osg-monitoring.cfg b/configs/xcache/config.d/40-osg-monitoring.cfg deleted file mode 100644 index fdcadd0f..00000000 --- a/configs/xcache/config.d/40-osg-monitoring.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# -# Configure XRootD hosts to utilize the OSG monitoring endpoints. -# -# ********************************************************************** -# * WARNING: DO NOT EDIT THIS FILE. IT WILL BE OVERWRITTEN ON UPGRADE * -# ********************************************************************** -# -# This file is part of the XCache Daemon -# https://opensciencegrid.org/docs/data/stashcache/overview/ - - -all.sitename $(resourcename) - -if defined ?DisableOsgMonitoring - # do nothing -else - xrd.report xrd-report.osgstorage.org:9931 - - xrootd.monitor all \ - auth \ - flush 30s \ - window 5s fstat 60 lfn ops xfr 5 \ - dest redir fstat info user xrd-report.osgstorage.org:9930 \ - dest fstat info user xrd-mon.osgstorage.org:9930 -fi diff --git a/configs/xcache/config.d/40-osg-paths.cfg b/configs/xcache/config.d/40-osg-paths.cfg deleted file mode 100644 index 10325ea5..00000000 --- a/configs/xcache/config.d/40-osg-paths.cfg +++ /dev/null @@ -1,18 +0,0 @@ -# -# Configure some paths used by XRootD. -# -# ********************************************************************** -# * WARNING: DO NOT EDIT THIS FILE. IT WILL BE OVERWRITTEN ON UPGRADE * -# ********************************************************************** -# -# Instead of editing this file: -# - Override OSG-provided defaults by dropping a site-specific configuration -# file in `/etc/xrootd/config.d` and prefixing it with "90-" or higher. -# -# This file is part of the XCache Daemon -# https://opensciencegrid.org/docs/data/stashcache/overview/ -# - -all.adminpath /var/spool/xrootd -all.pidpath /run/xrootd - diff --git a/rpm/xcache.spec b/rpm/xcache.spec index b19bb500..93645028 100644 --- a/rpm/xcache.spec +++ b/rpm/xcache.spec @@ -1,7 +1,7 @@ Name: xcache Summary: XCache scripts and configurations Version: 1.1.0 -Release: 0.4%{?dist} +Release: 1%{?dist} License: Apache 2.0 Group: Grid URL: https://opensciencegrid.org/docs/ @@ -19,6 +19,9 @@ Requires: voms-clients-cpp # We utilize a configuration directive (`continue`) introduced in XRootD 4.9. Requires: xrootd-server >= 1:4.9.0 +# Use common OSG XRootD configuration +Requires: osg-xrootd + Requires: grid-certificates >= 7 Requires: vo-client Requires: fetch-crl @@ -136,10 +139,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/xrd %{_unitdir}/xcache-reporter.timer %{_unitdir}/xrootd-renew-proxy.service %{_unitdir}/xrootd-renew-proxy.timer -%config(noreplace) %{_sysconfdir}/xrootd/config.d/10-common-site-local.cfg -%config %{_sysconfdir}/xrootd/config.d/40-osg-auth.cfg -%config %{_sysconfdir}/xrootd/config.d/40-osg-monitoring.cfg -%config %{_sysconfdir}/xrootd/config.d/40-osg-paths.cfg %config(noreplace) %{_sysconfdir}/xrootd/config.d/90-xcache-logging.cfg %config(noreplace) %{_sysconfdir}/xrootd/digauth.cfg %attr(-, xrootd, xrootd) %{_sysconfdir}/grid-security/xrd @@ -168,7 +167,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/xrd %config(noreplace) %{_sysconfdir}/xrootd/xcache-robots.txt %config %{_sysconfdir}/xrootd/xrootd-stash-cache.cfg %config %{_sysconfdir}/xrootd/xrootd-stash-cache-auth.cfg -%config %{_sysconfdir}/xrootd/config.d/40-osg-http.cfg %config %{_sysconfdir}/xrootd/config.d/40-stash-cache-plugin.cfg %config %{_sysconfdir}/xrootd/config.d/50-stash-cache-authz.cfg %config %{_sysconfdir}/xrootd/config.d/50-stash-cache-paths.cfg @@ -205,6 +203,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/xrd %config(noreplace) %{_sysconfdir}/xrootd/config.d/95-cms-xcache-logging.cfg %changelog +* Mon Aug 19 2019 Brian Lin - 1.1.0-1 +- Use osg-xrootd (SOFTWARE-3558) + * Wed Aug 7 2019 Edgar Fajardo - 1.1.0-0.4 - Changing order of LCMAPS configuration files for CMS - Fixing bug on refresh-proxy call for CMS and ATLAS proxies