From c0aa06c6d12f7ca0583db5268b22b2e41b6ee54e Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Fri, 24 Feb 2017 13:08:09 -0600 Subject: [PATCH 01/13] add files from OSG's subversion --- 60-osg.conf | 11 +++++++++++ config-osg.opensciencegrid.org.conf | 1 + opensciencegrid.org.pub | 10 ++++++++++ 3 files changed, 22 insertions(+) create mode 100644 60-osg.conf create mode 100644 config-osg.opensciencegrid.org.conf create mode 100644 opensciencegrid.org.pub diff --git a/60-osg.conf b/60-osg.conf new file mode 100644 index 0000000..a3319fe --- /dev/null +++ b/60-osg.conf @@ -0,0 +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 +# +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" diff --git a/config-osg.opensciencegrid.org.conf b/config-osg.opensciencegrid.org.conf new file mode 100644 index 0000000..252f524 --- /dev/null +++ b/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@" diff --git a/opensciencegrid.org.pub b/opensciencegrid.org.pub new file mode 100644 index 0000000..3fbbbd1 --- /dev/null +++ b/opensciencegrid.org.pub @@ -0,0 +1,10 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqQGYXTp9cRcMbGeDoijB +gKNTCEpIWB7XcqIHVXJjfxEkycQXMyZkB7O0CvV3UmmY2K7CQqTnd9ddcApn7BqQ +/7QGP0H1jfXLfqVdwnhyjIHxmV2x8GIHRHFA0wE+DadQwoi1G0k0SNxOVS5qbdeV +yiyKsoU4JSqy5l2tK3K/RJE4htSruPCrRCK3xcN5nBeZK5gZd+/ufPIG+hd78kjQ +Dy3YQXwmEPm7kAZwIsEbMa0PNkp85IDkdR1GpvRvDMCRmUaRHrQUPBwPIjs0akL+ +qoTxJs9k6quV0g3Wd8z65s/k5mEZ+AnHHI0+0CL3y80wnuLSBYmw05YBtKyoa1Fb +FQIDAQAB +-----END PUBLIC KEY----- + From 0e0fe20c4630d85ec6a94199736f2c2779a22981 Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Fri, 24 Feb 2017 13:08:51 -0600 Subject: [PATCH 02/13] remove old ligo-specific files --- ligo/60-osg.conf | 10 ------- ligo/README.md | 26 ------------------- ligo/config-osg.opensciencegrid.org.conf | 9 ------- ...fig\\x2dosg.opensciencegrid.org.automount" | 8 ------ ...-config\\x2dosg.opensciencegrid.org.mount" | 10 ------- ligo/cvmfs-ligo.osgstorage.org.automount | 12 --------- ligo/cvmfs-ligo.osgstorage.org.mount | 10 ------- .../cvmfs-oasis.opensciencegrid.org.automount | 12 --------- ligo/cvmfs-oasis.opensciencegrid.org.mount | 10 ------- ligo/default.local | 20 -------------- 10 files changed, 127 deletions(-) delete mode 100644 ligo/60-osg.conf delete mode 100644 ligo/README.md delete mode 100644 ligo/config-osg.opensciencegrid.org.conf delete mode 100644 "ligo/cvmfs-config\\x2dosg.opensciencegrid.org.automount" delete mode 100644 "ligo/cvmfs-config\\x2dosg.opensciencegrid.org.mount" delete mode 100644 ligo/cvmfs-ligo.osgstorage.org.automount delete mode 100644 ligo/cvmfs-ligo.osgstorage.org.mount delete mode 100644 ligo/cvmfs-oasis.opensciencegrid.org.automount delete mode 100644 ligo/cvmfs-oasis.opensciencegrid.org.mount delete mode 100644 ligo/default.local diff --git a/ligo/60-osg.conf b/ligo/60-osg.conf deleted file mode 100644 index 8150cdc..0000000 --- a/ligo/60-osg.conf +++ /dev/null @@ -1,10 +0,0 @@ -# /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 -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_FALLBACK_PROXY="http://cvmfsbproxy.cern.ch:3126;http://cvmfsbproxy.fnal.gov:3126" diff --git a/ligo/README.md b/ligo/README.md deleted file mode 100644 index e7db83b..0000000 --- a/ligo/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# Debian-specific CVMFS configuration for LIGO - -The files in this directory form the core of the CVMFS configuration for the LIGO -experiment for Debian-based hosts. - -These were adapted from the following configuration page: -> https://wiki.ligo.org/LVCcomputing/SiteConfiguration - -Sites or users looking to install and configure CVMFS should start -This repository is meant for those building .deb packages. - -RHEL (or similar) users should follow OSG's default documentation: -> https://twiki.grid.iu.edu/bin/view/Documentation/Release3/InstallCvmfs - -## Enabling CVMFS automount config on boot - -To enable the CVMFS automount point on boot, run: - -``` -systemctl enable cvmfs-config\\x2dosg.opensciencegrid.org.automount -systemctl enable cvmfs-ligo.osgstorage.org.automount -systemctl enable cvmfs-oasis.opensciencegrid.org.mount -``` - -This does *not* cause CVMFS to be mounted on boot. It enables the automount point, meaning -that CVMFS will be mounted on first access attempt. diff --git a/ligo/config-osg.opensciencegrid.org.conf b/ligo/config-osg.opensciencegrid.org.conf deleted file mode 100644 index 3e97a43..0000000 --- a/ligo/config-osg.opensciencegrid.org.conf +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/cvmfs/config.d/config-osg.opensciencegrid.org.conf -# -# DO NOT EDIT THIS FILE! -# It will be overwritten on upgrade. -# -# To override the configuration of this repository, edit: -# /etc/cvmfs/config.d/config-osg.opensciencegrid.local -# -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@" diff --git "a/ligo/cvmfs-config\\x2dosg.opensciencegrid.org.automount" "b/ligo/cvmfs-config\\x2dosg.opensciencegrid.org.automount" deleted file mode 100644 index 1c4f2fd..0000000 --- "a/ligo/cvmfs-config\\x2dosg.opensciencegrid.org.automount" +++ /dev/null @@ -1,8 +0,0 @@ - -[Unit] -SourcePath=/etc/fstab -Documentation=Automount point for the configuration CVMFS repository -Before=local-fs.target - -[Automount] -Where=/cvmfs/config-osg.opensciencegrid.org diff --git "a/ligo/cvmfs-config\\x2dosg.opensciencegrid.org.mount" "b/ligo/cvmfs-config\\x2dosg.opensciencegrid.org.mount" deleted file mode 100644 index c177f69..0000000 --- "a/ligo/cvmfs-config\\x2dosg.opensciencegrid.org.mount" +++ /dev/null @@ -1,10 +0,0 @@ - -[Unit] -Documentation=Mount point for the configuration CVMFS repository. - -[Mount] -What=config-osg.opensciencegrid.org -Where=/cvmfs/config-osg.opensciencegrid.org -Type=cvmfs -Options=noauto,x-systemd.automount - diff --git a/ligo/cvmfs-ligo.osgstorage.org.automount b/ligo/cvmfs-ligo.osgstorage.org.automount deleted file mode 100644 index 83d6920..0000000 --- a/ligo/cvmfs-ligo.osgstorage.org.automount +++ /dev/null @@ -1,12 +0,0 @@ - -[Unit] -Documentation=Automount point for the LIGO frame files CVMFS repository. -Before=local-fs.target - -[Automount] -Where=/cvmfs/ligo.osgstorage.org - -[Install] -WantedBy=local-fs.target -RequiredBy=local-fs.target - diff --git a/ligo/cvmfs-ligo.osgstorage.org.mount b/ligo/cvmfs-ligo.osgstorage.org.mount deleted file mode 100644 index 8ceb40e..0000000 --- a/ligo/cvmfs-ligo.osgstorage.org.mount +++ /dev/null @@ -1,10 +0,0 @@ - -[Unit] -Documentation=Mount point for the LIGO frame files CVMFS repository. - -[Mount] -What=ligo.osgstorage.org -Where=/cvmfs/ligo.osgstorage.org -Type=cvmfs -Options=noauto,x-systemd.automount - diff --git a/ligo/cvmfs-oasis.opensciencegrid.org.automount b/ligo/cvmfs-oasis.opensciencegrid.org.automount deleted file mode 100644 index 0685c5d..0000000 --- a/ligo/cvmfs-oasis.opensciencegrid.org.automount +++ /dev/null @@ -1,12 +0,0 @@ - -[Unit] -Documentation=Automount point for the OASIS CVMFS repository. -Before=local-fs.target - -[Automount] -Where=/cvmfs/oasis.opensciencegrid.org - -[Install] -WantedBy=local-fs.target -RequiredBy=local-fs.target - diff --git a/ligo/cvmfs-oasis.opensciencegrid.org.mount b/ligo/cvmfs-oasis.opensciencegrid.org.mount deleted file mode 100644 index 47b541e..0000000 --- a/ligo/cvmfs-oasis.opensciencegrid.org.mount +++ /dev/null @@ -1,10 +0,0 @@ - -[Unit] -Documentation=Mount point for the OASIS CVMFS repository. - -[Mount] -What=oasis.opensciencegrid.org -Where=/cvmfs/oasis.opensciencegrid.org -Type=cvmfs -Options=noauto,x-systemd.automount - diff --git a/ligo/default.local b/ligo/default.local deleted file mode 100644 index bdd3db5..0000000 --- a/ligo/default.local +++ /dev/null @@ -1,20 +0,0 @@ -# /etc/cvmfs/default.local -# -# This is the CVMFS-wide configuration file. It is SAFE to edit -# - - -# The size limit, in MB, of the CVMFS local disk cache. -# 20GB is the recommended value; we strongly suggest setting this below 10GB. -CVMFS_QUOTA_LIMIT=20000 - -# This turns off the local HTTP proxy by default. -# -# This is appropriate for an individual laptop or workstation. -# -# THIS IS NOT AN APPROPRIATE SETTING FOR A CLUSTER. -# -# We strongly recommend finding a local HTTP caching proxy if you will use -# CVMFS across multiple hosts at your site. -# -CVMFS_HTTP_PROXY="DIRECT" From 50a0eaaed8878c9c0d9677b9f093a0939831512f Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Fri, 24 Feb 2017 13:09:20 -0600 Subject: [PATCH 03/13] add cvmfs-config-osg service for Debian --- cvmfs-config-osg.service | 11 +++++++++++ cvmfs-config-osgd | 22 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 cvmfs-config-osg.service create mode 100755 cvmfs-config-osgd diff --git a/cvmfs-config-osg.service b/cvmfs-config-osg.service new file mode 100644 index 0000000..f4dcf19 --- /dev/null +++ b/cvmfs-config-osg.service @@ -0,0 +1,11 @@ +[Unit] +Description=daemon to keep /cvmfs/config-osg.opensciencegrid.org mounted +After=autofs.service + +[Service] +Type=simple +ExecStart=/usr/sbin/cvmfs-config-osgd -p /run/cvmfs-config-osgd.pid /cvmfs/config-osg.opensciencegrid.org +PIDFile=/run/cvmfs-config-osgd.pid + +[Install] +WantedBy=multi-user.target diff --git a/cvmfs-config-osgd b/cvmfs-config-osgd new file mode 100755 index 0000000..1f9b4e7 --- /dev/null +++ b/cvmfs-config-osgd @@ -0,0 +1,22 @@ +#!/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 [-p pidfile] directory_to_mount" >&2 + exit 1 +} + +if [ "$1" = "-p" ] && [ -n "$2" ]; then + echo $$ >$2 + shift 2 +fi +if [ -z "$1" ]; then + usage +fi +set -e +cd "$1" +exec -a $ME sleep infinity From 441486b36faceb4e25bc719f7df572b7ba7183df Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Fri, 24 Feb 2017 13:09:35 -0600 Subject: [PATCH 04/13] add redhat and debian packaging --- packaging/debian/Makefile | 17 +++ packaging/debian/build.sh | 56 ++++++++++ packaging/debian/changelog | 5 + packaging/debian/compat | 1 + packaging/debian/control | 12 +++ packaging/debian/copyright | 17 +++ packaging/debian/postrm | 33 ++++++ packaging/debian/rules | 3 + packaging/debian/source/format | 1 + packaging/redhat/cvmfs-config-osg.spec | 120 +++++++++++++++++++++ packaging/redhat/rpmbuild-cvmfs-config-osg | 35 ++++++ 11 files changed, 300 insertions(+) create mode 100644 packaging/debian/Makefile create mode 100755 packaging/debian/build.sh create mode 100644 packaging/debian/changelog create mode 100644 packaging/debian/compat create mode 100644 packaging/debian/control create mode 100644 packaging/debian/copyright create mode 100755 packaging/debian/postrm create mode 100755 packaging/debian/rules create mode 100644 packaging/debian/source/format create mode 100644 packaging/redhat/cvmfs-config-osg.spec create mode 100755 packaging/redhat/rpmbuild-cvmfs-config-osg diff --git a/packaging/debian/Makefile b/packaging/debian/Makefile new file mode 100644 index 0000000..0a5781b --- /dev/null +++ b/packaging/debian/Makefile @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +# This make file takes care of installing the files + +all: # nothing to build + +install: + mkdir -p $(DESTDIR)/etc/cvmfs/default.d \ + $(DESTDIR)/etc/cvmfs/config.d \ + $(DESTDIR)/etc/cvmfs/keys/opensciencegrid.org \ + $(DESTDIR)/lib/systemd/system \ + $(DESTDIR)/usr/sbin + cp 60-osg.conf $(DESTDIR)/etc/cvmfs/default.d + cp config-osg.opensciencegrid.org.conf $(DESTDIR)/etc/cvmfs/config.d + cp opensciencegrid.org.pub $(DESTDIR)/etc/cvmfs/keys/opensciencegrid.org + cp cvmfs-config-osg.service $(DESTDIR)/lib/systemd/system + cp cvmfs-config-osgd $(DESTDIR)/usr/sbin diff --git a/packaging/debian/build.sh b/packaging/debian/build.sh new file mode 100755 index 0000000..1f2533e --- /dev/null +++ b/packaging/debian/build.sh @@ -0,0 +1,56 @@ +#!/bin/sh + +set -e + +# +# This script used for package creation and debugging +# + +PKG=cvmfs-config-osg + +usage() { + echo "Sample script that builds the $PKG debian package from source" + echo "Usage: $0" + exit 1 +} + +if [ $# -ne 0 ]; then + usage +fi + +workdir=/tmp/build-$PKG +srctree=$(readlink --canonicalize ../..) + +if [ "$(ls -A $workdir 2>/dev/null)" != "" ]; then + echo "$workdir must be empty" + exit 2 +fi + +echo -n "creating workspace in $workdir... " +mkdir -p ${workdir}/tmp ${workdir}/src ${workdir}/result +echo "done" + +echo -n "copying source tree to $workdir/tmp... " +cp -R $srctree/* ${workdir}/tmp +echo "done" + +echo -n "initializing build environment... " +mkdir ${workdir}/src/$PKG +cp -R $srctree/* ${workdir}/src/$PKG +mkdir ${workdir}/src/$PKG/debian +cp -R ${workdir}/tmp/packaging/debian/* ${workdir}/src/$PKG/debian +cp ${workdir}/tmp/packaging/debian/Makefile ${workdir}/src/$PKG +echo "done" + +echo -n "figuring out version number from rpm packaging... " +upstream_version="`sed -n 's/^Version: //p' ../redhat/$PKG.spec`" +echo "done: $upstream_version" + +echo "building..." +cd ${workdir}/src/$PKG +dch -v $upstream_version -M "bumped upstream version number" + +cd debian +pdebuild --buildresult ${workdir}/result -- --save-after-exec --debug + +echo "Results are in ${workdir}/result" diff --git a/packaging/debian/changelog b/packaging/debian/changelog new file mode 100644 index 0000000..2a85211 --- /dev/null +++ b/packaging/debian/changelog @@ -0,0 +1,5 @@ +cvmfs-config-osg (0.1.0) stable; urgency=low + + * Place holder; this file is generated in build.sh + + -- Dave Dykstra Fri, 24 Feb 2017 18:00:00 +0000 diff --git a/packaging/debian/compat b/packaging/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/packaging/debian/compat @@ -0,0 +1 @@ +9 diff --git a/packaging/debian/control b/packaging/debian/control new file mode 100644 index 0000000..409b4b1 --- /dev/null +++ b/packaging/debian/control @@ -0,0 +1,12 @@ +Source: cvmfs-config-osg +Maintainer: Dave Dykstra +Section: config +Priority: extra +Standards-Version: 3.9.3.1 +Build-Depends: debhelper (>= 9) +Homepage: http://github.conf/opensciencegrid/cvmfs-config-osg + +Package: cvmfs-config-osg +Architecture: all +Depends: +Description: CernVM File System configuration for OSG diff --git a/packaging/debian/copyright b/packaging/debian/copyright new file mode 100644 index 0000000..40bb7ea --- /dev/null +++ b/packaging/debian/copyright @@ -0,0 +1,17 @@ + +Copyright: + + Copyright (c) 2017, OSG + +License: + + Distributed unter the BSD License. + +The Debian packaging is: + + Copyright (C) 2017 Dave Dykstra + +You are free to distribute this software under the terms of +the BSD License. +On Debian systems, the complete text of the BSD License can be +found in the file `/usr/share/common-licenses/BSD'. diff --git a/packaging/debian/postrm b/packaging/debian/postrm new file mode 100755 index 0000000..8921b1b --- /dev/null +++ b/packaging/debian/postrm @@ -0,0 +1,33 @@ +#!/bin/sh +# postrm script for cvmfs-config-osg +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove) + : + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/packaging/debian/rules b/packaging/debian/rules new file mode 100755 index 0000000..cbe925d --- /dev/null +++ b/packaging/debian/rules @@ -0,0 +1,3 @@ +#!/usr/bin/make -f +%: + dh $@ diff --git a/packaging/debian/source/format b/packaging/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/packaging/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/packaging/redhat/cvmfs-config-osg.spec b/packaging/redhat/cvmfs-config-osg.spec new file mode 100644 index 0000000..60100a2 --- /dev/null +++ b/packaging/redhat/cvmfs-config-osg.spec @@ -0,0 +1,120 @@ +Summary: CernVM File System OSG Configuration and Public Keys +Name: cvmfs-config-osg +Version: 2.0 +Release: 2%{?dist} +# download with: +# $ curl -L -o cvmfs-config-osg-%{version}.tar.gz \ +# https://github.com/opensciencegrid/cvmfs-config-osg/archive/v%{version}.tar.gz +Source: %{name}-%{version}.tar.gz +BuildArch: noarch +Group: Applications/System +License: BSD +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Provides: cvmfs-config = %{version}-%{release} +Obsoletes: cvmfs-keys < 1.6 +Provides: cvmfs-keys = 1.7 +Obsoletes: cvmfs-init-scripts < 1.0.21 +Provides: cvmfs-init-scripts = 1.0.22 + +Obsoletes: oasis-config < 8 +Provides: oasis-config = 9 + +Conflicts: cvmfs-config-default + +Conflicts: cvmfs < 2.3.3 +Conflicts: cvmfs-server < 2.3.3 + +%prep +%setup + +%description +Default configuration parameters and public keys for CernVM-FS + +%install +rm -rf $RPM_BUILD_ROOT +for cvmfsdir in keys/opensciencegrid.org config.d default.d; do + mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cvmfs/$cvmfsdir +done +for key in opensciencegrid.org.pub; do + install -D -m 444 "${key}" $RPM_BUILD_ROOT%{_sysconfdir}/cvmfs/keys/opensciencegrid.org +done +for defaultconf in 60-osg.conf; do + install -D -m 444 "${defaultconf}" $RPM_BUILD_ROOT%{_sysconfdir}/cvmfs/default.d +done +for conf in config-osg.opensciencegrid.org.conf; do + install -D -m 444 "${conf}" $RPM_BUILD_ROOT%{_sysconfdir}/cvmfs/config.d +done + +%files +%dir %{_sysconfdir}/cvmfs/keys/opensciencegrid.org +%{_sysconfdir}/cvmfs/keys/opensciencegrid.org/* +%config %{_sysconfdir}/cvmfs/default.d/* +%config %{_sysconfdir}/cvmfs/config.d/* + +%changelog +* Fri Feb 24 2017 Dave Dykstra - 2.0-2 +- Convert to store source on github. + +* Wed Feb 15 2017 Dave Dykstra - 2.0-1 +- Increase the version number further to make sure it is higher than + cvmfs-config-default. + +* Sat Feb 11 2017 Dave Dykstra - 1.3-1 +- Add CVMFS_CONFIG_REPO_REQUIRED=yes. Change Conflicts on cvmfs to be less + than version 2.3.3 because the option was added then. + +* Wed Jun 29 2016 Dave Dykstra - 1.2-5 +- Fix copy/paste error + +* Wed Jun 29 2016 Dave Dykstra - 1.2-4 +- Add CVMFS_FALLBACK_PROXY. + +* Fri Mar 25 2016 Dave Dykstra - 1.2-3 +- Switch to using config-osg.opensciencegrid.org config repository. + +* Mon Feb 1 2016 Dave Dykstra - 1.2-2 +- Update to official tagged 2.2.0-1 source. + +* Tue Jan 26 2016 Dave Dykstra - 1.2-1 +- Update cms.osgstorage.org config to only read cvmfs data with https + direct from the repository server. + +* Fri Jan 22 2016 Dave Dykstra - 1.2-0.2 +- Move to osg-upcoming, and adjust configs a little. + +* Fri Jan 15 2016 Dave Dykstra - 1.2-0.1 +- Testing build for cvmfs-2.2.0, including osgstorage.org configs. + +* Fri Oct 16 2015 Dave Dykstra - 1.1-8 +- Instead of having egi.eu and opensciencegrid.org domain configurations, + have a default configuration for any domain besides cern.ch that + reads from the OSG stratum 1s and accepts any repositorIes that are + found there and are verified by the opensciencegrid.org.pub key. + +* Tue Jul 28 2015 Dave Dykstra - 1.1-7 +- Change patch of /etc/cvmfs/domain.d/egi.eu.conf to include the + OSG public key as legitimate signer of egi.eu repositories, for + the purpose of emergency blanking. + +* Fri May 22 2015 Dave Dykstra - 1.1-6 +- Add specific versions on Obsoletes of cvmfs-keys and cvmfs-init-scripts, + and add a Provides of a version, as was done to cvmfs-config-default + upstream to follow Fedora packaging guidelines. Do likewise for + oasis-config. Add Conflicts for cvmfs-config-default. + +* Fri Mar 27 2015 Dave Dykstra - 1.1-5 +- add oasis.opensciencegrid.org.conf to set $OASIS_CERTIFICATES + +* Wed Mar 25 2015 Dave Dykstra - 1.1-4 +- add patch to set egi and osg repo servers to only OSG stratum 1s + +* Wed Mar 25 2015 Dave Dykstra - 1.1-3 +- add %{?dist} to release number + +* Wed Mar 25 2015 Dave Dykstra - 1.1-2 +- bump release only to allow koji to rebuild; the first attempt failed + because of a mysterious error in koji + +* Wed Mar 25 2015 Dave Dykstra - 1.1-1 +- initial creation, based on cvmfs-config-default.spec diff --git a/packaging/redhat/rpmbuild-cvmfs-config-osg b/packaging/redhat/rpmbuild-cvmfs-config-osg new file mode 100755 index 0000000..94e1fb4 --- /dev/null +++ b/packaging/redhat/rpmbuild-cvmfs-config-osg @@ -0,0 +1,35 @@ +#!/bin/bash +# This script is for building development rpms +# It assumes that ~/.rpmmacros has %_topdir set to rpmbuild area +# and that the source code is in ~/work/`echo $0|sed 's/.*build-//'` + +if [ $# != 0 ]; then + echo "No parameters accepted" >&2 + exit 1 +fi + +if [ ! -f ~/.rpmmacros ]; then + echo "No ~/.rpmmacros found" >&2 + exit 1 +fi +RPMBUILD="`sed -n 's/^%_topdir[ ]*//p' ~/.rpmmacros`" +if [ -z "$RPMBUILD" ]; then + echo "No %_topdir found in ~/.rpmmacros" >&2 + exit 1 +fi + +set -ex +PKG="`echo $0|sed 's/.*build-//'`" +SRCDIR=$HOME/work/$PKG +cd $SRCDIR +SPEC=packaging/redhat/$PKG.spec +VERSION="`sed -n 's/^Version: //p' $SPEC`" +cd $RPMBUILD/SOURCES +ln -fns $SRCDIR $PKG-$VERSION +tar chvf $PKG-$VERSION.tar.gz --exclude .git $PKG-$VERSION +rm -f $PKG-$VERSION +cd $RPMBUILD/SPECS +ln -fs $SRCDIR/$SPEC . +rpmbuild -ba $PKG.spec +rm ../SOURCES/$PKG-$VERSION.tar.gz +rm -f $PKG.spec From 4df670e56147ccc3a6f47b456390be2045ee6b7f Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Fri, 24 Feb 2017 13:10:15 -0600 Subject: [PATCH 05/13] update for Redhat & Debian packaging --- README.md | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 1bc58b0..2a429dc 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,27 @@ # cvmfs-config-osg -## CVMFS configuration files +## CVMFS configuration package for the Open Science Grid -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/ +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. -### 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: +End-user documentation for Redhat systems can be found here: https://twiki.grid.iu.edu/bin/view/Documentation/Release3/InstallCvmfs +For Debian, the End-user instructions are to install cvmfs from + https://cernvm.cern.ch/portal/filesystem/downloads +and this package from + 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 arond a Debian bug that causes autofs to +hang if a recursive automount is attempted. From 313899532dcc97a9b3a2d018d374c81b886d3885 Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Fri, 24 Feb 2017 13:40:23 -0600 Subject: [PATCH 06/13] add markdown formatting --- README.md | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2a429dc..5689cce 100644 --- a/README.md +++ b/README.md @@ -7,20 +7,32 @@ files for the Open Science Grid (OSG). It includes packaging for Redhat and Debian. End-user documentation for Redhat systems can be found here: +``` https://twiki.grid.iu.edu/bin/view/Documentation/Release3/InstallCvmfs +``` For Debian, the End-user instructions are to install cvmfs from - https://cernvm.cern.ch/portal/filesystem/downloads +``` +https://cernvm.cern.ch/portal/filesystem/downloads +``` and this package from - https://github.com/opensciencegrid/cvmfs-config-osg/releases +``` +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 +``` +/cvmfs /etc/auto.cvmfs +``` and restart autofs with - systemctl restart autofs +``` +systemctl restart autofs +``` and also enable and start the cvmfs-config-osg service with: - systemctl enable cvmfs-config-osg - systemctl start cvmfs-config-osg +``` +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 arond a Debian bug that causes autofs to From 95d8945bb920fc51297a12d9cb26fa8356d47db5 Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Fri, 24 Feb 2017 13:45:54 -0600 Subject: [PATCH 07/13] make URLs back into links --- README.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5689cce..d16eae3 100644 --- a/README.md +++ b/README.md @@ -6,19 +6,17 @@ 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. -End-user documentation for Redhat systems can be found here: -``` -https://twiki.grid.iu.edu/bin/view/Documentation/Release3/InstallCvmfs -``` +### 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 -``` -https://cernvm.cern.ch/portal/filesystem/downloads -``` +[the cvmfs download page](https://cernvm.cern.ch/portal/filesystem/downloads) and this package from -``` -https://github.com/opensciencegrid/cvmfs-config-osg/releases -``` +[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: ``` From 9991ad5a1bcbf00d2a1640c3261a38d4bec5cd5d Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Fri, 24 Feb 2017 13:58:08 -0600 Subject: [PATCH 08/13] fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d16eae3..bef80f1 100644 --- a/README.md +++ b/README.md @@ -33,5 +33,5 @@ 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 arond a Debian bug that causes autofs to +which is necessary to work around a Debian bug that causes autofs to hang if a recursive automount is attempted. From 8455f92ea1fd5820e4eee32ec32b3555aa6cabde Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Tue, 28 Feb 2017 13:45:10 -0600 Subject: [PATCH 09/13] add link to autofs.service.wants --- packaging/debian/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/debian/Makefile b/packaging/debian/Makefile index 0a5781b..8fc7964 100644 --- a/packaging/debian/Makefile +++ b/packaging/debian/Makefile @@ -9,9 +9,11 @@ install: $(DESTDIR)/etc/cvmfs/config.d \ $(DESTDIR)/etc/cvmfs/keys/opensciencegrid.org \ $(DESTDIR)/lib/systemd/system \ + $(DESTDIR)/lib/systemd/system/autofs.service.wants \ $(DESTDIR)/usr/sbin cp 60-osg.conf $(DESTDIR)/etc/cvmfs/default.d cp config-osg.opensciencegrid.org.conf $(DESTDIR)/etc/cvmfs/config.d cp opensciencegrid.org.pub $(DESTDIR)/etc/cvmfs/keys/opensciencegrid.org cp 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 cp cvmfs-config-osgd $(DESTDIR)/usr/sbin From 95d8808f1cd08a2e34909124c2225bbd0265c726 Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Tue, 28 Feb 2017 13:49:29 -0600 Subject: [PATCH 10/13] add Requires=autofs.service, remove PIDFile, and cd to etc subdir to make sure not just entering manually created dir --- cvmfs-config-osg.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cvmfs-config-osg.service b/cvmfs-config-osg.service index f4dcf19..8a82a5d 100644 --- a/cvmfs-config-osg.service +++ b/cvmfs-config-osg.service @@ -1,11 +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 -p /run/cvmfs-config-osgd.pid /cvmfs/config-osg.opensciencegrid.org -PIDFile=/run/cvmfs-config-osgd.pid +ExecStart=/usr/sbin/cvmfs-config-osgd /cvmfs/config-osg.opensciencegrid.org/etc [Install] WantedBy=multi-user.target From b9e0d071d98752ee20d8d8fb031dcbfe5e80afb0 Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Tue, 28 Feb 2017 13:49:52 -0600 Subject: [PATCH 11/13] remove -p option, not needed --- cvmfs-config-osgd | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cvmfs-config-osgd b/cvmfs-config-osgd index 1f9b4e7..a52de8f 100755 --- a/cvmfs-config-osgd +++ b/cvmfs-config-osgd @@ -1,20 +1,16 @@ #!/bin/bash -# This is intended to be run as a daemon in order to keep a -# CVMFS configuration repository mounted indefinitely on Debian. +# 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 [-p pidfile] directory_to_mount" >&2 + echo "Usage: $ME directory_to_mount" >&2 exit 1 } -if [ "$1" = "-p" ] && [ -n "$2" ]; then - echo $$ >$2 - shift 2 -fi -if [ -z "$1" ]; then +if [ $# != 1 ]; then usage fi set -e From 615b534dbb9aadf49680c3d9092d4e2556f68f76 Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Tue, 28 Feb 2017 13:53:32 -0600 Subject: [PATCH 12/13] OSG is not a legal entity --- packaging/debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/debian/copyright b/packaging/debian/copyright index 40bb7ea..637b5d4 100644 --- a/packaging/debian/copyright +++ b/packaging/debian/copyright @@ -1,7 +1,7 @@ Copyright: - Copyright (c) 2017, OSG + Copyright (c) 2017, Fermi National Accelerator Laboratory License: From b47413a5218db2b32214b42245debec547530019 Mon Sep 17 00:00:00 2001 From: Dave Dykstra Date: Tue, 28 Feb 2017 14:22:19 -0600 Subject: [PATCH 13/13] Use a common Makefile for installing on debian and redhat --- Makefile | 28 ++++++++++++++++++++++++++ packaging/debian/Makefile | 19 ----------------- packaging/debian/build.sh | 1 - packaging/redhat/cvmfs-config-osg.spec | 15 ++------------ 4 files changed, 30 insertions(+), 33 deletions(-) create mode 100644 Makefile delete mode 100644 packaging/debian/Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ae32081 --- /dev/null +++ b/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 diff --git a/packaging/debian/Makefile b/packaging/debian/Makefile deleted file mode 100644 index 8fc7964..0000000 --- a/packaging/debian/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/make -f - -# This make file takes care of installing the files - -all: # nothing to build - -install: - mkdir -p $(DESTDIR)/etc/cvmfs/default.d \ - $(DESTDIR)/etc/cvmfs/config.d \ - $(DESTDIR)/etc/cvmfs/keys/opensciencegrid.org \ - $(DESTDIR)/lib/systemd/system \ - $(DESTDIR)/lib/systemd/system/autofs.service.wants \ - $(DESTDIR)/usr/sbin - cp 60-osg.conf $(DESTDIR)/etc/cvmfs/default.d - cp config-osg.opensciencegrid.org.conf $(DESTDIR)/etc/cvmfs/config.d - cp opensciencegrid.org.pub $(DESTDIR)/etc/cvmfs/keys/opensciencegrid.org - cp 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 - cp cvmfs-config-osgd $(DESTDIR)/usr/sbin diff --git a/packaging/debian/build.sh b/packaging/debian/build.sh index 1f2533e..c9b5292 100755 --- a/packaging/debian/build.sh +++ b/packaging/debian/build.sh @@ -39,7 +39,6 @@ mkdir ${workdir}/src/$PKG cp -R $srctree/* ${workdir}/src/$PKG mkdir ${workdir}/src/$PKG/debian cp -R ${workdir}/tmp/packaging/debian/* ${workdir}/src/$PKG/debian -cp ${workdir}/tmp/packaging/debian/Makefile ${workdir}/src/$PKG echo "done" echo -n "figuring out version number from rpm packaging... " diff --git a/packaging/redhat/cvmfs-config-osg.spec b/packaging/redhat/cvmfs-config-osg.spec index 60100a2..8dd996d 100644 --- a/packaging/redhat/cvmfs-config-osg.spec +++ b/packaging/redhat/cvmfs-config-osg.spec @@ -33,18 +33,7 @@ Default configuration parameters and public keys for CernVM-FS %install rm -rf $RPM_BUILD_ROOT -for cvmfsdir in keys/opensciencegrid.org config.d default.d; do - mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cvmfs/$cvmfsdir -done -for key in opensciencegrid.org.pub; do - install -D -m 444 "${key}" $RPM_BUILD_ROOT%{_sysconfdir}/cvmfs/keys/opensciencegrid.org -done -for defaultconf in 60-osg.conf; do - install -D -m 444 "${defaultconf}" $RPM_BUILD_ROOT%{_sysconfdir}/cvmfs/default.d -done -for conf in config-osg.opensciencegrid.org.conf; do - install -D -m 444 "${conf}" $RPM_BUILD_ROOT%{_sysconfdir}/cvmfs/config.d -done +make install-redhat DESTDIR=$RPM_BUILD_ROOT %files %dir %{_sysconfdir}/cvmfs/keys/opensciencegrid.org @@ -53,7 +42,7 @@ done %config %{_sysconfdir}/cvmfs/config.d/* %changelog -* Fri Feb 24 2017 Dave Dykstra - 2.0-2 +* Tue Feb 28 2017 Dave Dykstra - 2.0-2 - Convert to store source on github. * Wed Feb 15 2017 Dave Dykstra - 2.0-1