Skip to content

Commit 652c5de

Browse files
bbockelmbbockelm
committed
Improve LIGO configuration files.
Includes explicit systemd units for mounts / automounts -- this avoids the need to edit /etc/fstab in order to enable CVMFS.
1 parent 7e89374 commit 652c5de

12 files changed

+107
-15
lines changed

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@ Please, refer to [`ligo directory`](ligo/) for config files. Useful documenation
1313
1414
### For OSG
1515

16-
...coming soon...
16+
This repository is meant for packaging CVMFS configuration; it is not meant for end-users.
17+
18+
End-user documentation can be found here:
19+
https://twiki.grid.iu.edu/bin/view/Documentation/Release3/InstallCvmfs
20+

‎ligo/60-osg.conf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
# Usual location:
21
# /etc/cvmfs/default.d/60-osg.conf
2+
#
3+
# DO NOT EDIT THIS FILE
4+
# It will be replaced on upgrade. To override, edit:
5+
# /etc/cvmfs/default.local
36
CVMFS_SEND_INFO_HEADER=yes
47
CVMFS_KEYS_DIR=/etc/cvmfs/keys/opensciencegrid.org
58
CVMFS_USE_GEOAPI=yes

‎ligo/README.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
# cvmfs-config-osg/ligo
1+
# Debian-specific CVMFS configuration for LIGO
22

3-
Useful documenation about site specific configuration:
3+
The files in this directory form the core of the CVMFS configuration for the LIGO
4+
experiment for Debian-based hosts.
5+
6+
These were adapted from the following configuration page:
47
> https://wiki.ligo.org/LVCcomputing/SiteConfiguration
8+
9+
Sites or users looking to install and configure CVMFS should start
10+
This repository is meant for those building .deb packages.
11+
12+
RHEL (or similar) users should follow OSG's default documentation:
13+
> https://twiki.grid.iu.edu/bin/view/Documentation/Release3/InstallCvmfs
14+

‎ligo/config-osg.opensciencegrid.org.conf‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
# Usual location:
21
# /etc/cvmfs/config.d/config-osg.opensciencegrid.org.conf
2+
#
3+
# DO NOT EDIT THIS FILE!
4+
# It will be overwritten on upgrade.
5+
#
6+
# To override the configuration of this repository, edit:
7+
# /etc/cvmfs/config.d/config-osg.opensciencegrid.local
8+
#
39
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@"

‎ligo/cvmfs-config\x2dosg.opensciencegrid.org.automount‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
[Unit]
3+
SourcePath=/etc/fstab
4+
Documentation=Automount point for the configuration CVMFS repository
5+
Before=local-fs.target
6+
7+
[Automount]
8+
Where=/cvmfs/config-osg.opensciencegrid.org

‎ligo/cvmfs-config\x2dosg.opensciencegrid.org.mount‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
[Unit]
3+
Documentation=Mount point for the configuration CVMFS repository.
4+
5+
[Mount]
6+
What=config-osg.opensciencegrid.org
7+
Where=/cvmfs/config-osg.opensciencegrid.org
8+
Type=cvmfs
9+
Options=noauto,x-systemd.automount
10+

‎ligo/cvmfs-ligo.osgstorage.org.automount‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
[Unit]
3+
Documentation=Automount point for the LIGO frame files CVMFS repository.
4+
Before=local-fs.target
5+
6+
[Automount]
7+
Where=/cvmfs/ligo.osgstorage.org
8+
9+
[Install]
10+
WantedBy=local-fs.target
11+
RequiredBy=local-fs.target
12+

‎ligo/cvmfs-ligo.osgstorage.org.mount‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
[Unit]
3+
Documentation=Mount point for the LIGO frame files CVMFS repository.
4+
5+
[Mount]
6+
What=ligo.osgstorage.org
7+
Where=/cvmfs/ligo.osgstorage.org
8+
Type=cvmfs
9+
Options=noauto,x-systemd.automount
10+

‎ligo/cvmfs-oasis.opensciencegrid.org.automount‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
[Unit]
3+
Documentation=Automount point for the OASIS CVMFS repository.
4+
Before=local-fs.target
5+
6+
[Automount]
7+
Where=/cvmfs/oasis.opensciencegrid.org
8+
9+
[Install]
10+
WantedBy=local-fs.target
11+
RequiredBy=local-fs.target
12+

‎ligo/cvmfs-oasis.opensciencegrid.org.mount‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
[Unit]
3+
Documentation=Mount point for the OASIS CVMFS repository.
4+
5+
[Mount]
6+
What=oasis.opensciencegrid.org
7+
Where=/cvmfs/oasis.opensciencegrid.org
8+
Type=cvmfs
9+
Options=noauto,x-systemd.automount
10+

0 commit comments

Comments
 (0)