change cookbook name

documents/manual.markdown

-The script `files/default/cvmfs-install` deploys a specific 
-version of CernVM-FS [1] on the local node. Copy the script to
-`/usr/local/src` and execute it like:
+# Deployment
+
+The script `files/default/cvmfs-install` deploys a specific version of CernVM-FS [1] locally. Copy this script to `/usr/local/src` and execute (as root):
 
     » lsb_release -d
     Description:    Debian GNU/Linux 7.0 (wheezy)
@@ -11,7 +11,7 @@ version of CernVM-FS [1] on the local node. Copy the script to
     Build finished.
     Installation finished.
 
-Alternatively build a Debian package and install it:
+Alternatively build a Debian package and install CVMFS using the package:
 
     » /usr/local/src/cvmfs-install -p 2.1.15
     All build dependencies available.
@@ -29,17 +29,20 @@ Alternatively build a Debian package and install it:
     -rw-r--r--  1 root staff 25151434 Oct 31 13:54 cvmfs_2.1.15.orig.tar.gz
     -rw-r--r--  1 root staff 51782134 Oct 31 14:01 cvmfs_2.1.15.tar.gz
     […]
-    » dpkg -i /usr/local/src/cvmfs_2.1.15_amd64.deb 
+    » apt-get install $(dpkg -f cvmfs_2.1.15_amd64.deb depends | tr -d ',')
+    » dpkg -i cvmfs_2.1.15_amd64.deb 
+
+It is recommended to test the package inside a clean environment (different node), before shipping to a package mirror.
 
+# Configuration
 
 ## Server
 
-This install Apache before creating a CernVM-FS file-system
-repository:
+This install Apache before creating a CernVM-FS file-system repository:
 
     » apt-get install apache2
     » cvmfs_server mkfs repo.devops.test
-    [...SNIP...]
+    […]
     » cvmfs_server transaction
     » df -h -t aufs -t fuse
     Filesystem             Size  Used Avail Use% Mounted on
@@ -48,9 +51,7 @@ repository:
     » ls -1 /cvmfs/repo.devops.test
     new_repository
 
-Details are described in the CernVM-FS Technical Report [2].
-In order to update the repository (add/remove content) use
-the `cvmfs_server` script:
+Details are described in the CernVM-FS Technical Report [2].  In order to update the repository (add/remove content) use the `cvmfs_server` script:
 
     » cvmfs_server transaction
     » echo "Content" > /cvmfs/repo.devops.test/test.txt
@@ -78,8 +79,6 @@ Deploy the HTTP proxy:
     http_access allow devops
     » /etc/init.d/squid3 restart
 
-
-
 ## Clients
 
 Make sure FUSE is correctly configured:

recipes/default.rb

@@ -18,10 +18,15 @@
 #
 
 # Install from source if a specific version is defined 
-include_recipe 'cvmfs::install'
+unless node.cvmfs.version.empty?
+  include_recipe 'cernvm-fs::install'
+# Otherwise it is assumed a package can be installed
+else
+  package 'cvmfs'
+end
 
 if node.cvmfs.server.repos.empty?
-  include_recipe 'cvmfs::client'
+  include_recipe 'cernvm-fs::client'
 else
-  include_recipe 'cvmfs::server'
+  include_recipe 'cernvm-fs::server'
 end

tests/roles/cvmfs_client_test.rb

 name "cvmfs_client_test"
 description "Use to test the [cvmfs::client] recipe."
-run_list( "recipe[cvmfs]" )
+run_list( "recipe[cernvm-fs]" )
 default_attributes(
   "cvmfs" => {
-    "version" => "2.1.8",
     "client" => {
       "config_d" => {
-        "hades.devops.test" => {
+        "alpha.devops.test" => {
           "server_url" => "http://lxfs01.devops.test/cvmfs/@org@",
           "http_proxy" => "DIRECT",
-          "public_key" => "/etc/cvmfs/keys/hades.devops.test.pub"
+          "public_key" => "/etc/cvmfs/keys/alpha.devops.test.pub"
         },
-        "apollo.devops.test" => {
+        "betta.devops.test" => {
           "server_url" => "http://lxfs02.devops.test/cvmfs/@org@",
-          "public_key" => "/etc/cvmfs/keys/apollo.devops.test.pub"
+          "public_key" => "/etc/cvmfs/keys/betta.devops.test.pub"
         }      
       }  
     }

tests/roles/cvmfs_server_test.rb

 name "cvmfs_server_test"
 description "Use to test the [cvmfs::server] recipe."
-run_list( "recipe[cvmfs]" )
+run_list( "recipe[cernvm-fs]" )
 default_attributes(
   "cvmfs" => {
-    "version" => "2.1.8",
     "server" => {
-      "repos" => [ 'hades.devops.test' ]
+      "repos" => [ 'alpha.devops.test' ]
     } 
   }
 )