Skip to content
This repository has been archived by the owner on Mar 12, 2021. It is now read-only.

Commit

Permalink
minor code updates and important documentation changes for release 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Claudio Cacciari committed Jul 10, 2014
1 parent 3e7e4cd commit 5875a3a
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 40 deletions.
2 changes: 2 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ All rights reserved.
<Robert Verkerk - SurfSARA, contact [email protected]>
<Jani Heikkinen - CSC, [email protected]>
<Giacomo Mariani - Cineca, contact [email protected]>
<Michal Jankowski - PSNC, contact [email protected]>


Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Expand Down
17 changes: 12 additions & 5 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
B2SAFE module 2.2 [2014/07/09]
- defined a set of properties to publish the basic local B2SAFE configuration
- on demand checksum generation and verification tools based on replica location paths
- partial implementation of a basic authentication mechanism: sync of remote user accounts with local cache

B2SAFE module 2.1 [2014/06/04]
- refined the integrity check mechanism
- defined a rule for the replication of a collection of objects
- added a script to deploy automatically the module
- bug fixing

B2SAFE module 2.0 [2014/04/13]
- added an integrity check mechanism: see <module_home>/docs/integrityCheck.pdf
- improved the PID interlinking mechanism: see <module_home>/docs/PID_interlinking-1.pdf
- defined a rule for the replication of a single object: see <module_home>/docs/transferSingleFile.jpg
- added a new logging mechanism
- added a new authorization mechanism

B2SAFE module 2.1 [2014/06/04]
- refined the integrity check mechanism
- defined a rule for the replication of a collection of objects
- added a script to deploy automatically the module
- bug fixing

Binary file modified docs/administrator.guide.pdf
Binary file not shown.
Binary file removed docs/transferSingleFile.jpg
Binary file not shown.
4 changes: 2 additions & 2 deletions info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Brief: EUDAT Microservices
Description: Micro services required by the EUDAT infrastructure to support
the safe replication and PID management services

See https://confluence.csc.fi/display/Eudat/iRODS+PID+Management
See https://github.com/EUDAT-B2SAFE/B2SAFE-core/blob/latest/docs/administrator.guide.pdf
for more details.

Enabled: yes
Creator: Willem Elbers - Max Planck Institute for Psycholinguistics, contact [email protected]
Created: August 2012
License: GPL 3.0
License: BSD
20 changes: 5 additions & 15 deletions install.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,11 @@ Manually:

2. create a symbolic link to the eudat rulebase
cd <irods>
ln -s <absolute-irods-path>/modules/B2SAFE/rulebase/eudat.re ./server/config/reConfigs/eudat.re
ln -s <absolute-irods-path>/modules/B2SAFE/rulebase/replication.re ./server/config/reConfigs/replication.re
ln -s <absolute-irods-path>/modules/B2SAFE/rulebase/pid-service.re ./server/config/reConfigs/pid-service.re
ln -s <absolute-irods-path>/modules/B2SAFE/rulebase/catchError.re ./server/config/reConfigs/catchError.re
ln -s <absolute-irods-path>/modules/B2SAFE/rulebase/eudat-authZ-filters.re ./server/config/reConfigs/eudat-authZ-filters.re
ln -s <absolute-irods-path>/modules/B2SAFE/rulebase/local.re ./server/config/reConfigs/local.re

3. edit <irods>/server/config/server.config and append ",eudat,replication,pid-service,catchError,eudat-authZ-filters,local" to "reRuleSet"
ln -s <absolute-irods-path>/modules/B2SAFE/rulebase/*.re ./server/config/reConfigs/*.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
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.
Expand Down Expand Up @@ -135,13 +132,6 @@ The command files are written to the shared iRODS space and are used to control
*new_pid the (generated) handle of the destination object (the child)


*** TODO ***

- improve logic and data actual written/conveyed
--> merge pid.create and pid.update actions in a single command file
- improve error handling


*** Know bugs ***

- the rule set string in the file <irods>/server/config/server.config has a limit of 64 characters.
Expand Down
19 changes: 1 addition & 18 deletions scripts/conf/remote.users.sync.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,8 @@ logfile=remote.sync.log
# possible values: INFO, DEBUG, ERROR, WARNING
loglevel=DEBUG
usersfile=test/irods.external
#dnsfile=test/irods.DNs.map

# section for HBP_prjtome
[HBP_prjtome]

# section for EUHIT_Repo
[EUHIT_Repo]
ckan_api_root=xxxxxxxxxxxx
admin_api_key=xxxxxxxxxxxxx
# default_groups=proj1, proj2, proj3 ...
# groups intended for all the users
default_groups=EUHIT_Read

# section for MyProxy
[MyProxy]
irods_path_to_dns=/CINECA01/home/proirod1/validDN
gridftp_cert_dn=/C=IT/O=INFN/OU=Host/L=CINECA-SAP/CN=data.repo.cineca.it

[EUDAT]
host=https://unity.eudat-aai.fz-juelich.de:8443/rest-admin/v1/
username=
password=
password=

0 comments on commit 5875a3a

Please sign in to comment.