Merge pull request #99 from brianhlin/SOFTWARE-5478.multiuser-origin

Start XRootD with multiuser caps if necessary (SOFTWARE-5478)

Author: brianhlin

stash-origin/image-config.d/10-stash-origin.sh

@@ -13,9 +13,16 @@ fi
 : "${XC_AUTH_ORIGIN_EXPORT=} ${XC_PUBLIC_ORIGIN_EXPORT=} ${XC_ORIGINEXPORT=}"
 
 if [[ $XC_AUTH_ORIGIN_EXPORT ]]; then
-  supervisord_enable stash-origin-auth
-  supervisord_enable stash-origin-auth-cmsd
+  if [[ -n $XC_ENABLE_MULTIUSER ]]; then
+    supervisord_enable stash-origin-auth-privileged
+    supervisord_enable stash-origin-auth-cmsd-privileged
+  else
+    supervisord_enable stash-origin-auth
+    supervisord_enable stash-origin-auth-cmsd
+  fi
 else
+  supervisord_enable stash-origin-auth-privileged
+  supervisord_enable stash-origin-auth-cmsd-privileged
   supervisord_disable stash-origin-auth
   supervisord_disable stash-origin-auth-cmsd
 fi

stash-origin/supervisord.d/stash-origin-auth-cmsd-privileged.conf

@@ -0,0 +1,5 @@
+[program:stash-origin-auth-cmsd-privileged]
+command=/sbin/capsh --caps="cap_setgid+p cap_setuid+p" -- -c "/usr/bin/cmsd -l /var/log/xrootd/cmsd.log -c /etc/xrootd/xrootd-stash-origin-auth.cfg -k fifo -s /var/run/xrootd/cmsd-stash-origin-auth.pid -n stash-origin-auth -R xrootd"
+directory=/var/spool/xrootd
+autorestart=true
+environment=LD_PRELOAD=/usr/lib64/libtcmalloc.so,TCMALLOC_RELEASE_RATE=10

stash-origin/supervisord.d/stash-origin-auth-privileged.conf

@@ -0,0 +1,5 @@
+[program:stash-origin-auth-privileged]
+command=/sbin/capsh --caps="cap_setgid+p cap_setuid+p" -- -c "xrootd -c /etc/xrootd/xrootd-stash-origin-auth.cfg -k fifo -n stash-origin-auth -k %(ENV_XC_NUM_LOGROTATE)s -s /var/run/xrootd/xrootd-origin-origin-auth.pid -l /var/log/xrootd/xrootd.log -R xrootd"
+directory=/var/spool/xrootd
+autorestart=true
+environment=LD_PRELOAD=/usr/lib64/libtcmalloc.so,TCMALLOC_RELEASE_RATE=10