chnaged the install.txt - manual installation

install.txt

@@ -21,34 +21,27 @@ Enable the module
 
 Automatically:
 
-1.1. enable the module in "<irods>/modules/B2SAFE/info.txt"
-     If a previous version of the module is present, disable it before to install the new one, in "<irods>/
-     modules/OLD_MODULE/info.txt" (if the directory name is the same, change it)
-
-1.2. rerun the irodssetup script
-
-Manually:
-
-1.1. <irods>/scripts/configure --enable-B2SAFE
-     If a previous version of the module is present, disable it before to install the new one (if the directory  
-     name is the same, change it):
-     <irods>/scripts/configure --disable-OLD_MODULE --enable-B2SAFE
-1.2. make clean
-1.3. make
-1.4 <irods>/irodsctl restart
+0. download the git repository 
+   from https://github.com/EUDAT-B2SAFE/B2SAFE-core/releases
 
+1. copy source conf dir (/whre_you_have_downloaded/B2SAFE-core/conf) 
+   to the future config directory    of the b2safe module 
+   (for irods4: /etc/irods/b2safe-core; for irods3: /home/user/b2safe-core)
 
 2. create a symbolic link to the eudat rulebase
-  cd <irods>
-  ln -s <absolute-irods-path>/modules/B2SAFE/rulebase/*.re ./server/config/reConfigs/*.re
+  for irods3: ln -s /whre_you_have_downloaded/B2SAFE-core/rulebase/*.re <irods>/server/config/reConfigs/*.re
+  for irods4: ln -s /whre_you_have_downloaded/B2SAFE-core/rulebase/*.re /etc/irods/*.re
+
   replacing the jolly character "*" with each file name available in the directory "rulebase".
 
-3. edit <irods>/server/config/server.config and append to "reRuleSet" the list of ruleset file names written 
+3. edit <irods>/server/config/server.config (irods3) or /etc/irods/server.config (irods4)
+   and append to "reRuleSet" the list of ruleset file names written 
    in a single line and without the suffix".re", in this way ",filename1,filename2,filename3 ..."  
 	(make sure to include the comma and no spaces)
 
 4. configure iRODS hooks.
-	edit the <irods>/server/config/reConfigs/core.re file and add the following two acPostProcForPutHooks:
+	edit the <irods>/server/config/reConfigs/core.re (irods3) or /etc/irods/core.re (irods4) file 
+	and add the following two acPostProcForPutHooks:
 
 	acPostProcForPut {
         	ON($objPath like "\*.replicate") {
@@ -61,30 +54,40 @@ Manually:
        	 	}
 	}
 
-5. properly configure the default resource in <irods>/server/config/reConfigs/core.re
+5. properly configure the default resource in <irods>/server/config/reConfigs/core.re (irods3) 
+   or /etc/irods/core.re (irods4)
 
 6.1 install the python scripts
-	cd <irods>
-        ln -s <absolute-irods-path>/modules/B2SAFE/cmd/* ./server/bin/cmd/
+   for irods3: <irods_dir> is usually /home/user/iRODS
+   for irods4: <irods_dir> is usually /var/lib/irods/iRODS
+   ln -s /whre_you_have_downloaded/B2SAFE-core/cmd/* <irods_dir>/server/bin/cmd/
         check permissions on the scripts and make sure they are executable by the irods user
             e.g.chmod u+x cmd/*
 
-6.2 update the "getEpicApiParameters" rule in "./server/config/reConfigs/local.re"
-    - Configure the credential storage type: "os": stored on the local filesystem or "irods": stored on de irods namespace.
+6.2 update the "getEpicApiParameters" rule in "./server/config/reConfigs/euloc.re" (irods3)
+    or /etc/irods/euloc.re (irods4)
+    - Configure the credential storage type: "os": stored on the local filesystem 
+      or "irods": stored on de irods namespace.
     - Set the path to the credentials file
-    - set the correct serverID to include the fully qualified hostname. For instance: "irods://node.domain.com:1247"
-    - Set the proper values in the credentials file (see ./cmd/credentials_example for an example)
-6.3 update the "getAuthZParameters" rule in "./server/config/reConfigs/local.re"
-    - Set the proper values in modules/B2SAFE/cmd/authz.map.json
-6.4 update the "getLogParameters" rule in "./server/config/reConfigs/local.re"
-    - Set the proper values in modules/B2SAFE/cmd/log.manager.conf
+    - set the correct serverID to include the fully qualified hostname. 
+      For instance: "irods://node.domain.com:1247"
+    - Set the proper values in the credentials file 
+      (see /whre_you_have_downloaded/B2SAFE-core/cmd/credentials_example for an example)
+
+6.3 update the "getAuthZParameters" rule in "./server/config/reConfigs/euloc.re" (irods3)
+    or /etc/irods/euloc.re (irods4)
+    - Set the proper values in <irods>/server/bin/cmd/authz.map.json
+
+6.4 update the "getLogParameters" rule in "./server/config/reConfigs/euloc.re" (irods3)
+    or /etc/irods/euloc.re (irods4)
+    - Set the proper values in <irods>/server/bin/cmd/log.manager.conf
 
-7. create a shared space in all zones as configured in the eudat.re rulebase getSharedCollection function.
-        - defaults to "<zone>/replicate"
-        - make sure all users involved in the replication can write in this collection.
+7. create a shared space in all zones (local and remote), for example: "<zone>/replicate".
+    Grant all users involved in the replication write access to this collection.
 
 8.0.1 change "#!/usr/bin/env python" in the python scripts in modules/B2SAFE/cmd/ to your python installation
-8.0.2 install httplib2, simplejson, lxml, defusedxml, and pylint:
+
+8.0.2 install httplib2, simplejson, lxml, defusedxml,  queuelib, and pylint:
 	httplib2
 	download from http://code.google.com/p/httplib2
 	python setup.py install
@@ -97,15 +100,25 @@ Manually:
         pip install defusedxml
         apt-get install pylint
         yum install pylint
+
+    queuelib
+    download from https://pypi.python.org/pypi/queuelib
+    python setup.py install
 
-8.1 test the epic api interaction by running the "./cmd/epicclient.py test" script manually and with "iexecmd epicclient.py"
-8.2 test the replication by changing and triggering "replicate.r" rule in <irods>/modules/B2SAFE/rules
+8.1 test the epic api interaction by running 
+    "./cmd/epicclient.py <os_or_irods> <path_to_credentials> test" script manually 
+    and with "iexecmd epicclient.py"
+
+8.2 test the module by changing and triggering rules in <irods>/modules/B2SAFE/rules
+    For example, eudatRepl.r to replicate a data set. See the hints inside the rule.
 
 DATACENTER only:
 
-it is necessary to configure the authz.map.json file in order to allow user to execute rules, which calls external scripts (see documentation).
+it is necessary to configure the <irods>/server/bin/cmd/authz.map.json file 
+in order to allow user to execute rules, which calls external scripts (see documentation).
 
-it is necessary to configure the log.manager.conf file in order to enable the logging system (see documentation).
+it is necessary to configure the <irods>/server/bin/cmd/log.manager.conf file 
+in order to enable the logging system (see documentation).
 
 *** Command files ***