Use osg-xrootd (SOFTWARE-3558)

opensciencegrid · Aug 19, 2019 · 1181b23 · 1181b23
1 parent 6152fd9
commit 1181b23
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 135 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/configs/xcache/config.d/40-osg-auth.cfg b/configs/xcache/config.d/40-osg-auth.cfg
diff --git a/configs/xcache/config.d/40-osg-monitoring.cfg b/configs/xcache/config.d/40-osg-monitoring.cfg
diff --git a/configs/xcache/config.d/40-osg-paths.cfg b/configs/xcache/config.d/40-osg-paths.cfg
diff --git 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 <[email protected]> - 1.1.0-1
+- Use osg-xrootd (SOFTWARE-3558)
+
 * Wed Aug 7 2019 Edgar Fajardo <[email protected]> - 1.1.0-0.4
 - Changing order of LCMAPS configuration files for CMS
 - Fixing bug on refresh-proxy call for CMS and ATLAS proxies