Move gridmapfiles to subdir. needed for Kube

cmscaltech · Jan 24, 2024 · 35638e1 · 35638e1
1 parent 448972d
commit 35638e1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/xrootd/xcache-server/Dockerfile b/xrootd/xcache-server/Dockerfile
@@ -16,7 +16,8 @@ RUN yum -y install xrootd xrootd-client xrootd-client-devel xrootd-client-libs \
                    xrootd-voms voms-clients xrootd-doc xrootd-scitokens scitokens-cpp && yum clean all
 
 RUN mkdir -p /var/log/xrootd/clustered/ && \
-    chown -R xrootd:xrootd /var/log/xrootd/
+    chown -R xrootd:xrootd /var/log/xrootd/ &&
+    mkdir -p /etc/grid-security/mapfile/
 
 # XCache Rucio reporter. Installing it manually
 #RUN yum -y install git procps-ng && yum clean all
@@ -46,8 +47,8 @@ COPY config/default/etc/grid-security/vomsdir/cms/voms-cms-auth.app.cern.ch.lsc
 COPY config/default/etc/grid-security/vomsdir/cms/voms2.cern.ch.lsc /etc/grid-security/vomsdir/cms/voms2.cern.ch.lsc
 
 # Add default grid and voms mapfile
-COPY config/default/etc/grid-security/grid-mapfile /etc/grid-security/grid-mapfile
-COPY config/default/etc/grid-security/voms-mapfile /etc/grid-security/voms-mapfile
+COPY config/default/etc/grid-security/mapfile/grid-mapfile /etc/grid-security/mapfile/grid-mapfile
+COPY config/default/etc/grid-security/mapfile/voms-mapfile /etc/grid-security/mapfile/voms-mapfile
 
 # Add cron to fetch crl on boot
 COPY config/default/etc/cron.d/fetch-crl-reboot /etc/cron.d/fetch-crl-reboot

diff --git a/...ig/default/etc/grid-security/grid-mapfile → ...lt/etc/grid-security/mapfile/grid-mapfile b/...ig/default/etc/grid-security/grid-mapfile → ...lt/etc/grid-security/mapfile/grid-mapfile
diff --git a/...ig/default/etc/grid-security/voms-mapfile → ...lt/etc/grid-security/mapfile/voms-mapfile b/...ig/default/etc/grid-security/voms-mapfile → ...lt/etc/grid-security/mapfile/voms-mapfile
diff --git a/xrootd/xcache-server/config/default/etc/xrootd/xrootd.cfg b/xrootd/xcache-server/config/default/etc/xrootd/xrootd.cfg
@@ -105,8 +105,8 @@ pfc.allow_xrdpfc_command
 # XrootD Security
 # ---------------------------------------
 xrootd.seclib /usr/lib64/libXrdSec.so
-voms.mapfile /etc/grid-security/voms-mapfile
-sec.protocol /usr/lib64 gsi -certdir:/etc/grid-security/certificates -cert:$(xrdcert) -key:$(xrdkey) -crl:1 -gmapopt:trymap -gridmap:/etc/grid-security/grid-mapfile -vomsfun:default
+voms.mapfile /etc/grid-security/mapfile/voms-mapfile
+sec.protocol /usr/lib64 gsi -certdir:/etc/grid-security/certificates -cert:$(xrdcert) -key:$(xrdkey) -crl:1 -gmapopt:trymap -gridmap:/etc/grid-security/mapfile/grid-mapfile -vomsfun:default
 acc.authdb /etc/xrootd/auth_file
 ofs.authorize
 macaroons.secretkey /etc/xrootd/macaroon-secret