From b97f909b36b4d57220e0c5fd69fd05a367482276 Mon Sep 17 00:00:00 2001 From: Fabio Hernandez Date: Fri, 14 Dec 2018 16:59:46 +0100 Subject: [PATCH 1/3] Modify configuration to use CERN and OpenScienceGrid stratum 1s --- buildLinuxPkg.sh | 7 ++++++ etc/cvmfs/config.d/sw.lsst.eu.conf | 25 +++++++++++++++++++ .../sw.lsst.eu.local} | 20 +++++++-------- etc/cvmfs/domain.d/lsst.eu.conf | 19 +++----------- version.sh | 2 +- 5 files changed, 45 insertions(+), 28 deletions(-) create mode 100644 etc/cvmfs/config.d/sw.lsst.eu.conf rename etc/cvmfs/{domain.d/lsst.eu.local => config.d/sw.lsst.eu.local} (73%) diff --git a/buildLinuxPkg.sh b/buildLinuxPkg.sh index 9969444..141908f 100755 --- a/buildLinuxPkg.sh +++ b/buildLinuxPkg.sh @@ -22,6 +22,13 @@ mkdir -p ${outputDir} # rm -f ${outputDir}/${packageName}*.{rpm,deb} +# +# Set appropriate permissions +# +chmod ugo-wx,ugo+r ./etc/cvmfs/keys/lsst.eu/*.pub +chmod ugo-wx,ugo+r ./etc/cvmfs/domain.d/lsst.eu.conf +chmod ugo-wx,ugo+r ./etc/cvmfs/config.d/sw.lsst.eu.* + # # Build RPM and DEB packages # diff --git a/etc/cvmfs/config.d/sw.lsst.eu.conf b/etc/cvmfs/config.d/sw.lsst.eu.conf new file mode 100644 index 0000000..6424296 --- /dev/null +++ b/etc/cvmfs/config.d/sw.lsst.eu.conf @@ -0,0 +1,25 @@ +#-----------------------------------------------------------------------------# +# File: /etc/cvmfs/config.d/sw.lsst.eu.conf # +# Purpose: configuration of CernVM-FS file system for repository # +# 'sw.lsst.eu' # +# Author: Fabio Hernandez (fabio@in2p3.fr) # +# Documentation: https://sw.lsst.eu # +#-----------------------------------------------------------------------------# + +# +# List of stratum 1 servers of the 'sw.lsst.eu' repository +# Separate servers by ';' +# +CVMFS_SERVER_URL='http://cclssts1.in2p3.fr/cvmfs/@fqrn@;http://cvmfs-stratum-one.cern.ch/cvmfs/@fqrn@;http://cvmfs-s1goc.opensciencegrid.org/cvmfs/@fqrn@' + +# +# List of load-balanced proxy groups. Each proxy group is composed +# of a list of URLs separated by ';'. Groups are separated by '|'. +# +CVMFS_HTTP_PROXY='http://cclsstsqd.in2p3.fr:3128|DIRECT' + +# +# Geographically sort the servers according to geographic proximity +# +CVMFS_USE_GEOAPI=yes + diff --git a/etc/cvmfs/domain.d/lsst.eu.local b/etc/cvmfs/config.d/sw.lsst.eu.local similarity index 73% rename from etc/cvmfs/domain.d/lsst.eu.local rename to etc/cvmfs/config.d/sw.lsst.eu.local index cf03f4e..a976693 100644 --- a/etc/cvmfs/domain.d/lsst.eu.local +++ b/etc/cvmfs/config.d/sw.lsst.eu.local @@ -1,11 +1,11 @@ #-----------------------------------------------------------------------------# -# File: /etc/cvmfs/domain.d/lsst.eu.local # -# Purpose: configuration of CernVM-FS file system 'sw.lsst.eu' # +# File: /etc/cvmfs/config.d/lsst.eu.local # +# Purpose: configuration of CernVM-FS file system for repository # +# 'sw.lsst.eu' # # Author: Fabio Hernandez (fabio@in2p3.fr) # # Documentation: https://sw.lsst.eu # #-----------------------------------------------------------------------------# - # # If needed, add 'sw.lsst.eu' to the list of repositories this computer # can mount @@ -15,20 +15,18 @@ if [[ ! $CVMFS_REPOSITORIES =~ sw.lsst.eu ]]; then CVMFS_REPOSITORIES=${CVMFS_REPOSITORIES}',sw.lsst.eu' fi - # # Amount of local storage (in megabytes) the CernVM-FS client will # use to cache remote files in local storage of this computer. # A single version of the LSST software stack and its dependencies -# takes more than 10 GB, but not all files in a given version are +# takes about 10 GB, but not all files of a given release are # used at the same time. # -CVMFS_QUOTA_LIMIT=${CVMFS_QUOTA_LIMIT:-10000} -if [[ $CVMFS_QUOTA_LIMIT -le 10000 ]]; then - CVMFS_QUOTA_LIMIT=10000 +CVMFS_QUOTA_LIMIT=${CVMFS_QUOTA_LIMIT:-12000} +if [[ $CVMFS_QUOTA_LIMIT -le 12000 ]]; then + CVMFS_QUOTA_LIMIT=12000 fi - # # This tells the CernVM-FS client to use a single local cache for # all the repositories mounted by this computer. Set to 'yes' if @@ -36,10 +34,10 @@ fi # CVMFS_SHARED_CACHE=${CVMFS_SHARED_CACHE:-yes} - # # The default cache directory is '/var/lib/cvmfs' but you can change it by # uncommenting and customizing the line below. Make sure this directory # exists and is located on a local file system. # -# CVMFS_CACHE_BASE=/path/to/my/cache +# CVMFS_CACHE_BASE='/path/to/my/cache/dir' + diff --git a/etc/cvmfs/domain.d/lsst.eu.conf b/etc/cvmfs/domain.d/lsst.eu.conf index 52254f6..1b23cbb 100644 --- a/etc/cvmfs/domain.d/lsst.eu.conf +++ b/etc/cvmfs/domain.d/lsst.eu.conf @@ -1,27 +1,14 @@ #-----------------------------------------------------------------------------# # File: /etc/cvmfs/domain.d/lsst.eu.conf # -# Purpose: configuration of CernVM-FS file system 'sw.lsst.eu' # +# Purpose: configuration of CernVM-FS file system repositories # +# served by domain 'lsst.eu' # # Author: Fabio Hernandez (fabio@in2p3.fr) # # Documentation: https://sw.lsst.eu # #-----------------------------------------------------------------------------# - -# -# List of stratum 1 servers of the repositories for the 'lsst.eu' domain -# Separate servers by ';' -# -CVMFS_SERVER_URL='http://cclssts1.in2p3.fr/cvmfs/@fqrn@;http://cvmfs-stratum-one.cern.ch/cvmfs/@fqrn@' - - -# -# List of load-balanced proxy groups. Each proxy group is composed -# of a list of URLs separated by ';'. Groups are separated by '|'. -# -CVMFS_HTTP_PROXY='http://cclsstsqd.in2p3.fr:3128|DIRECT' - - # # Directory where the public key for the repositories of the domain # 'lsst.eu' is located. # CVMFS_KEYS_DIR='/etc/cvmfs/keys/lsst.eu' + diff --git a/version.sh b/version.sh index 6fb9bf9..225c87b 100644 --- a/version.sh +++ b/version.sh @@ -1,4 +1,4 @@ # Returns the version of the configuration package pkgVersion() { - echo "0.6" + echo "0.7" } From 004c7e644d154e5a131fc31ed3f96de4ad584f3e Mon Sep 17 00:00:00 2001 From: Fabio Hernandez Date: Fri, 14 Dec 2018 17:03:11 +0100 Subject: [PATCH 2/3] Fix typo in comment --- etc/cvmfs/config.d/sw.lsst.eu.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/cvmfs/config.d/sw.lsst.eu.local b/etc/cvmfs/config.d/sw.lsst.eu.local index a976693..ba212f4 100644 --- a/etc/cvmfs/config.d/sw.lsst.eu.local +++ b/etc/cvmfs/config.d/sw.lsst.eu.local @@ -1,5 +1,5 @@ #-----------------------------------------------------------------------------# -# File: /etc/cvmfs/config.d/lsst.eu.local # +# File: /etc/cvmfs/config.d/sw.lsst.eu.local # # Purpose: configuration of CernVM-FS file system for repository # # 'sw.lsst.eu' # # Author: Fabio Hernandez (fabio@in2p3.fr) # From f1b07138d87ef68f3addf748ba97a4735da59e24 Mon Sep 17 00:00:00 2001 From: Fabio Hernandez Date: Fri, 14 Dec 2018 17:07:04 +0100 Subject: [PATCH 3/3] Ignore archives dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ef6aab6..a5fbde1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ docs/_build docs/_static docs/_templates utils/ +archives/ *.deb *.pkg *.rpm