Merge branch 'development'

.gitignore

@@ -2,6 +2,7 @@ docs/_build
 docs/_static
 docs/_templates
 utils/
+archives/
 *.deb
 *.pkg
 *.rpm

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
 #

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
+

etc/cvmfs/domain.d/lsst.eu.local → 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/sw.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,31 +15,29 @@ 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
 # not already set.
 #
 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'
+

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'
+

version.sh

@@ -1,4 +1,4 @@
 # Returns the version of the configuration package
 pkgVersion() {
-	echo "0.6"
+	echo "0.7"
 }