Merge pull request #69 from efajardo/refresh-proxy-cms

Adding overrides config for CMS and ATLAS proxy

Makefile

@@ -91,6 +91,7 @@ install:
 	mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)
 	install -p -m 0644 $(SYSTEMD_UNITS) $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)
 	# systemd unit overrides
+	mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd-renew-proxy.service.d
 	# stash-cache
 	mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/[email protected]
 	mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/[email protected]
@@ -108,11 +109,13 @@ install:
 	# atlas-xcache
 	mkdir -p mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/[email protected]
 	install -p -m 0644 configs/atlas-xcache/overrides/10-atlas-xcache-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/[email protected]/
+	install -p -m 0644 configs/atlas-xcache/overrides/xrootd-renew-proxy/10-atlas-refresh-proxy-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd-renew-proxy.service.d/
 	# cms-xcache
 	mkdir -p mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/[email protected]
 	mkdir -p mkdir -p $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/[email protected]
 	install -p -m 0644 configs/cms-xcache/overrides/xrootd/10-cms-xcache-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/[email protected]/
 	install -p -m 0644 configs/cms-xcache/overrides/cmsd/10-cms-xcache-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/[email protected]/
+	install -p -m 0644 configs/cms-xcache/overrides/xrootd-renew-proxy/10-cms-refresh-proxy-overrides.conf $(DESTDIR)/$(INSTALL_SYSTEMD_UNITDIR)/xrootd-renew-proxy.service.d/
 	# systemd tempfiles
 	mkdir -p $(DESTDIR)/run/stash-cache
 	mkdir -p $(DESTDIR)/run/stash-cache-auth

configs/atlas-xcache/overrides/xrootd-renew-proxy/10-atlas-refresh-proxy-overrides.conf

@@ -0,0 +1,3 @@
+[Service]
+ExecStart =
+ExecStart = /usr/libexec/xcache/renew-proxy atlas

configs/cms-xcache/overrides/xrootd-renew-proxy/10-cms-refresh-proxy-overrides.conf

@@ -0,0 +1,3 @@
+[Service]
+ExecStart =
+ExecStart = /usr/libexec/xcache/renew-proxy cms

configs/stash-cache/config.d/40-stash-cache-plugin.cfg

@@ -20,6 +20,8 @@ if named atlas-xcache
 
    # Load the Rucio namespace-mapping plugin
    pss.namelib -lfncache /usr/lib64/XrdName2NameDCP4RUCIO.so
+   # Allow new version of RUcio Xcache management 
+   pss.ccmlib XrdName2NameDCP4RUCIO.so
 else if exec xrootd && named cms-xcache
    pss.origin cmsxrootd.fnal.gov:1094
 

rpm/xcache.spec

@@ -1,7 +1,7 @@
 Name:      xcache
 Summary:   XCache scripts and configurations
 Version:   1.1.0
-Release:   0.1%{?dist}
+Release:   0.3%{?dist}
 License:   Apache 2.0
 Group:     Grid
 URL:       https://opensciencegrid.org/docs/
@@ -86,6 +86,7 @@ Summary: The ATLAS data federation cache server
 
 Requires: %{name} = %{version}
 Requires: wget
+Requires: xrootd-rucioN2N-for-Xcache
 
 %description -n atlas-xcache
 %{summary}
@@ -184,6 +185,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/xrd
 %files -n atlas-xcache
 %config %{_sysconfdir}/xrootd/xrootd-atlas-xcache.cfg
 %{_unitdir}/[email protected]/10-atlas-xcache-overrides.conf
+%{_unitdir}/xrootd-renew-proxy.service.d/10-atlas-refresh-proxy-overrides.conf
 %config %{_sysconfdir}/xrootd/config.d/40-atlas-xcache-plugin.cfg
 %config %{_sysconfdir}/xrootd/config.d/50-atlas-xcache-paths.cfg
 %config(noreplace) %{_sysconfdir}/xrootd/config.d/90-atlas-xcache-disks.cfg
@@ -194,6 +196,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/xrd
 %config %{_sysconfdir}/xrootd/Authfile-cms-xcache
 %{_unitdir}/[email protected]/10-cms-xcache-overrides.conf
 %{_unitdir}/[email protected]/10-cms-xcache-overrides.conf
+%{_unitdir}/xrootd-renew-proxy.service.d/10-cms-refresh-proxy-overrides.conf
 %config %{_sysconfdir}/xrootd/config.d/40-cms-xcache-plugin.cfg
 %config %{_sysconfdir}/xrootd/config.d/50-cms-xcache-authz.cfg
 %config %{_sysconfdir}/xrootd/config.d/50-cms-xcache-paths.cfg
@@ -202,6 +205,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/xrd
 %config(noreplace) %{_sysconfdir}/xrootd/config.d/95-cms-xcache-logging.cfg
 
 %changelog
+* Mon Aug 5 2019 Edgar Fajardo <[email protected]> - 1.1.0-0.3
+- Adding ATLAS and CMS overides for the proxy generation
+- Adding RucioN2N config for ATLAS Xcache (SOFTWARE-3784)
+
+* Fri Aug 2 2019 Brian Lin <[email protected]> - 1.1.0-0.2
+- Changing auths options for lcmaps
+
 * Wed Jul 31 2019 Edgar Fajardo <[email protected]> - 1.1.0-0.1
 - Add ATLAS and CMS XCache (SOFTWARE-3583, SOFTWARE-3584)