Merge pull request #1 from DrDaveD/master

Make general purpose shared source between Redhat & Debian

Author: bbockelm

ligo/60-osg.conf renamed to 60-osg.conf

@@ -1,10 +1,11 @@
 # /etc/cvmfs/default.d/60-osg.conf
 #
 # DO NOT EDIT THIS FILE
-# It will be replaced on upgrade.  To override, edit:
-# /etc/cvmfs/default.local
+# It will be replaced on upgrade.  To override, edit /etc/cvmfs/default.local
+#
 CVMFS_SEND_INFO_HEADER=yes
 CVMFS_KEYS_DIR=/etc/cvmfs/keys/opensciencegrid.org
 CVMFS_USE_GEOAPI=yes
 CVMFS_CONFIG_REPOSITORY=config-osg.opensciencegrid.org
+CVMFS_CONFIG_REPO_REQUIRED=yes
 CVMFS_FALLBACK_PROXY="http://cvmfsbproxy.cern.ch:3126;http://cvmfsbproxy.fnal.gov:3126"

Makefile

@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+
+# This make file takes care of installing files
+
+all: # nothing to build
+
+# default install target is debian because that's the easist way to
+#   set up the 'rules' file.
+install: install-debian
+
+install-common:
+	mkdir -p $(DESTDIR)/etc/cvmfs/default.d \
+	  $(DESTDIR)/etc/cvmfs/config.d \
+	  $(DESTDIR)/etc/cvmfs/keys/opensciencegrid.org
+	install -D -m 444 60-osg.conf $(DESTDIR)/etc/cvmfs/default.d
+	install -D -m 444 config-osg.opensciencegrid.org.conf $(DESTDIR)/etc/cvmfs/config.d
+	install -D -m 444 opensciencegrid.org.pub $(DESTDIR)/etc/cvmfs/keys/opensciencegrid.org
+
+install-debian: install-common
+	mkdir -p $(DESTDIR)/lib/systemd/system \
+	  $(DESTDIR)/lib/systemd/system/autofs.service.wants \
+	  $(DESTDIR)/usr/sbin
+	install -D -m 444 cvmfs-config-osg.service $(DESTDIR)/lib/systemd/system
+	ln -s ../cvmfs-config-osg.service $(DESTDIR)/lib/systemd/system/autofs.service.wants/cvmfs-config-osg.service
+	install -D -m 555 cvmfs-config-osgd $(DESTDIR)/usr/sbin
+
+# assume DESTDIR=$RPM_BUILD_ROOT is passed in
+install-redhat: install-common

README.md

@@ -1,20 +1,37 @@
 # cvmfs-config-osg
 
-## CVMFS configuration files
-
-Repository for configuration files used to setup experiment-specific CVMFS area within OSG.
-Things to remember: 
-* keep this repository and existing `cvmfs-config-osg` RPM in sync, current stream at https://vdt.cs.wisc.edu/svn/native/redhat/trunk/cvmfs-config-osg/
-
-### For LIGO
-
-Please, refer to [`ligo directory`](ligo/) for config files. Useful documenation about site specific configuration:
-> https://wiki.ligo.org/LVCcomputing/SiteConfiguration
-
-### For OSG
-
-This repository is meant for packaging CVMFS configuration; it is not meant for end-users.
-
-End-user documentation can be found here:
-https://twiki.grid.iu.edu/bin/view/Documentation/Release3/InstallCvmfs
-
+## CVMFS configuration package for the Open Science Grid
+
+This is the source for the CernVM File System (CVMFS) configuration
+files for the Open Science Grid (OSG).  It includes packaging for
+Redhat and Debian.
+
+### Redhat
+
+End-user documentation for Redhat systems can be found
+[here](https://twiki.grid.iu.edu/bin/view/Documentation/Release3/InstallCvmfs).
+
+### Debian
+
+For Debian, the End-user instructions are to install cvmfs from
+[the cvmfs download page](https://cernvm.cern.ch/portal/filesystem/downloads)
+and this package from
+[github](https://github.com/opensciencegrid/cvmfs-config-osg/releases).
+Then if you want to enable autofs, add the following contents
+into /etc/auto.master.d/cvmfs.autofs:
+```
+/cvmfs /etc/auto.cvmfs
+```
+and restart autofs with
+```
+systemctl restart autofs
+```
+and also enable and start the cvmfs-config-osg service with:
+```
+systemctl enable cvmfs-config-osg
+systemctl start cvmfs-config-osg
+```
+That service will start a daemon to make sure that the configuration
+repository /cvmfs/config-osg.opensciencegrid.org stays mounted,
+which is necessary to work around a Debian bug that causes autofs to
+hang if a recursive automount is attempted.

config-osg.opensciencegrid.org.conf

@@ -0,0 +1 @@
+CVMFS_SERVER_URL="http://cvmfs-s1bnl.opensciencegrid.org:8000/cvmfs/@fqrn@;http://cvmfs-s1fnal.opensciencegrid.org:8000/cvmfs/@fqrn@;http://cvmfs-s1goc.opensciencegrid.org:8000/cvmfs/@fqrn@"

cvmfs-config-osg.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=daemon to keep /cvmfs/config-osg.opensciencegrid.org mounted
+Requires=autofs.service
+After=autofs.service
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/cvmfs-config-osgd /cvmfs/config-osg.opensciencegrid.org/etc
+
+[Install]
+WantedBy=multi-user.target

cvmfs-config-osgd

@@ -0,0 +1,18 @@
+#!/bin/bash
+# This is intended to be run as a daemon in order to keep a CVMFS
+#  configuration repository mounted indefinitely on Debian.
+#  It is to work around the fact that Debian's autofs does not allow
+#  recursive mounts.
+ME="`basename $0`"
+usage()
+{
+    echo "Usage: $ME directory_to_mount" >&2
+    exit 1
+}
+
+if [ $# != 1 ]; then
+    usage
+fi
+set -e
+cd "$1"
+exec -a $ME sleep infinity