Commit 94c4ce5d authored by Fabio Hernandez's avatar Fabio Hernandez
Browse files

Merge branch 'develop'

parents a6058947 d3f8bbbc
...@@ -43,8 +43,8 @@ We have succesfully tested several versions of the LSST software using this inst ...@@ -43,8 +43,8 @@ We have succesfully tested several versions of the LSST software using this inst
To download the software from CERN's repository and install it do: To download the software from CERN's repository and install it do:
$ cd /tmp $ cd /tmp
$ curl -O https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.1.19/cvmfs-2.1.19-1.el6.x86_64.rpm $ curl -O https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.1.20/cvmfs-2.1.20-1.el6.x86_64.rpm
$ curl -O https://cvmrepo.web.cern.ch/cvmrepo/yum/cvmfs/EL/5/x86_64/cvmfs-keys-1.5-1.noarch.rpm $ curl -O https://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-default-1.2-2.noarch.rpm
$ sudo yum install --assumeyes ./cvmfs-*.rpm $ sudo yum install --assumeyes ./cvmfs-*.rpm
### Installing on Ubuntu 14.04 (64 bits) ### Installing on Ubuntu 14.04 (64 bits)
...@@ -55,8 +55,8 @@ Some packages are either necessary or recommended on Ubuntu. To install them do: ...@@ -55,8 +55,8 @@ Some packages are either necessary or recommended on Ubuntu. To install them do:
Download and install CernVM FS: Download and install CernVM FS:
$ cd /tmp $ cd /tmp
$ curl -O https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.1.19/cvmfs_2.1.19_amd64.deb $ curl -O https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.1.20/cvmfs_2.1.20_amd64.deb
$ curl -O https://ecsft.cern.ch/dist/cvmfs/cvmfs-keys/cvmfs-keys_1.5-1_all.deb $ curl -O https://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-default_1.1-1_all.deb
$ sudo dpkg -i ./cvmfs-keys_1.5-1_all.deb ./cvmfs_2.1.19_amd64.deb $ sudo dpkg -i ./cvmfs-keys_1.5-1_all.deb ./cvmfs_2.1.19_amd64.deb
### Installing on OS X 10.9 Mavericks and 10.10 Yosemite ### Installing on OS X 10.9 Mavericks and 10.10 Yosemite
......
...@@ -24,54 +24,47 @@ fi ...@@ -24,54 +24,47 @@ fi
# Configure CernVM FS # Configure CernVM FS
# WARNING: make sure we don't overwrite any existing configuration, different # WARNING: make sure we don't overwrite any existing configuration, different
# than ours # than ours
if [ -e /etc/cvmfs/default.local ]; then localConfig="/etc/cvmfs/default.local"
diff "/etc/cvmfs/default.local" "default.local" > /dev/null 2>&1 if [ -e ${localConfig} ]; then
if [ $? -ne 0 ]; then repos=`grep CVMFS_REPOSITORIES ${localConfig} | sed s/CVMFS_REPOSITORIES=//g`
if [ -n $repos ] && [ $repos != "lsst.in2p3.fr" ]; then
echo "CernVM FS seems to be already configured in this machine in a potentially incompatible way" echo "CernVM FS seems to be already configured in this machine in a potentially incompatible way"
echo "see file /etc/cvmfs/default.local" echo "see file /etc/cvmfs/default.local"
exit 1 exit 1
fi fi
fi fi
cp default.local /etc/cvmfs/default.local cp default.local /etc/cvmfs/default.local && \
chmod 0644 /etc/cvmfs/default.local chmod 0644 /etc/cvmfs/default.local
# Configure the LSST repository and store its public key # Configure the LSST repository and store its public key
cp lsst.in2p3.fr.conf /etc/cvmfs/config.d/lsst.in2p3.fr.conf cp lsst.in2p3.fr.conf /etc/cvmfs/config.d/lsst.in2p3.fr.conf && \
chmod 0644 /etc/cvmfs/config.d/lsst.in2p3.fr.conf chmod 0644 /etc/cvmfs/config.d/lsst.in2p3.fr.conf
cp lsst.in2p3.fr.pub /etc/cvmfs/keys/lsst.in2p3.fr.pub
chmod 0444 /etc/cvmfs/keys/lsst.in2p3.fr.pub rm -f /etc/cvmfs/keys/lsst.in2p3.fr.pub
mkdir -p /etc/cvmfs/keys/in2p3.fr && \
cp lsst.in2p3.fr.pub /etc/cvmfs/keys/in2p3.fr/lsst.in2p3.fr.pub && \
chmod 0444 /etc/cvmfs/keys/in2p3.fr/lsst.in2p3.fr.pub
# On Linux, use 'cvmfs_config' to check the configuration # Perform system-specific tasks
thisOS=`uname` thisOS=`uname`
if [ "$thisOS" == "Linux" ]; then if [ "$thisOS" == "Linux" ]; then
# Use 'cvmfs_config' to check the configuration
result=`/usr/bin/cvmfs_config chksetup` result=`/usr/bin/cvmfs_config chksetup`
if [ "$result" != "OK" ]; then if [ "$result" != "OK" ]; then
echo "There was an error checking your CernVM FS configuration:" echo "There was an error checking your CernVM FS configuration:"
echo $result echo $result
exit 1 exit 1
fi fi
fi
# On MacOS X, create the mount directory
if [ "$thisOS" == "Darwin" ]; then
mkdir -p /cvmfs/lsst.in2p3.fr
fi
# Check that we can reach the CernVM FS server # Restart autofs
source ./lsst.in2p3.fr.conf
curl -s --proxy ${CVMFS_HTTP_PROXY} --head ${CVMFS_SERVER_URL} > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "Cannot reach repository proxy server: $CVMFS_HTTP_PROXY"
exit 1
fi
# On Linux, restart autofs
if [ "$thisOS" == "Linux" ]; then
service autofs restart > /dev/null 2>&1 service autofs restart > /dev/null 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Could not restart autofs service" echo "Could not restart autofs service"
exit 1 exit 1
fi fi
elif [ "$thisOS" == "Darwin" ]; then
# On MacOS X, create the mount directory
mkdir -p /cvmfs/lsst.in2p3.fr
fi fi
# Done # Done
......
CVMFS_SERVER_URL="http://cccrnvmfss1li01.in2p3.fr/cvmfs/lsst.in2p3.fr" CVMFS_SERVER_URL="http://cccrnvmfss1li01.in2p3.fr/cvmfs/lsst.in2p3.fr"
CVMFS_HTTP_PROXY="http://cccvmfssqdli01.in2p3.fr:3128" CVMFS_HTTP_PROXY="http://cccvmfssqdli01.in2p3.fr:3128"
CVMFS_PUBLIC_KEY="/etc/cvmfs/keys/lsst.in2p3.fr.pub" CVMFS_PUBLIC_KEY="/etc/cvmfs/keys/in2p3.fr/lsst.in2p3.fr.pub"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment