Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Re-enabling S3 storage for Fedora 6 #132

Closed
wants to merge 3 commits into from
Closed

WIP: Re-enabling S3 storage for Fedora 6 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0322c4c
Accept parameters for s3 storage
noahwsmith Mar 31, 2021
1155da6
Documenting available values for S3
noahwsmith Mar 31, 2021
c71e8bf
Fix formatting in documentation
nigelgbanks Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions fcrepo6/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ additional settings, volumes, ports, etc.
## Volumes

| Path | Description |
| :---- | :---------------|
| :---- | :-------------- |
| /data | OCFL Filesystem |

> N.B. Volumes are not created automatically. It is up to the user to either bind
Expand All @@ -30,16 +30,21 @@ additional settings, volumes, ports, etc.

### Confd Settings

| Environment Variable | Confd Key | Default | Description |
| :----------------------------- | :------------------------------ | :-------------------------------- | :------------------------------------------------------------------------------------------------ |
| FCREPO_ACTIVEMQ_BROKER | /fcrepo/activemq/broker | tcp://activemq:61616 | The location of the ActiveMQ Broker in which to publish JMS messages to |
| FCREPO_ACTIVEMQ_QUEUE | /fcrepo/activemq/queue | fedora | The ActiveMQ Queue in which to publish JMS messages |
| FCREPO_ACTIVEMQ_QUEUE_ENABLE | /fcrepo/activemq/queue | false | If `true` publish JMS messages on the queue `FCREPO_ACTIVEMQ_QUEUE` |
| FCREPO_ACTIVEMQ_TOPIC | /fcrepo/activemq/topic | fedora | The ActiveMQ Topic in which to publish JMS messages |
| FCREPO_ACTIVEMQ_TOPIC_ENABLE | /fcrepo/activemq/topic | true | If `true` publish JMS messages on the topic `FCREPO_ACTIVEMQ_TOPIC` |
| FCREPO_BINARYSTORAGE_TYPE | /fcrepo/binarystorage/type | file | The binary storage type. Only `file` and `s3` are supported at this time |
| FCREPO_PERSISTENCE_TYPE | /fcrepo/persistence/type | file | The object store type. Only `file`, `mysql`, `postgresql` are supported at this time |
| FCREPO_DISABLE_SYN | /fcrepo/disable/syn | false | Enable or disable authentication via [Syn](https://github.com/Islandora/Syn) |
| Environment Variable | Confd Key | Default | Description |
| :--------------------------- | :------------------------- | :------------------- | :----------------------------------------------------------------------------------- |
| FCREPO_ACTIVEMQ_BROKER | /fcrepo/activemq/broker | tcp://activemq:61616 | The location of the ActiveMQ Broker in which to publish JMS messages to |
| FCREPO_ACTIVEMQ_QUEUE | /fcrepo/activemq/queue | fedora | The ActiveMQ Queue in which to publish JMS messages |
| FCREPO_ACTIVEMQ_QUEUE_ENABLE | /fcrepo/activemq/queue | false | If `true` publish JMS messages on the queue `FCREPO_ACTIVEMQ_QUEUE` |
| FCREPO_ACTIVEMQ_TOPIC | /fcrepo/activemq/topic | fedora | The ActiveMQ Topic in which to publish JMS messages |
| FCREPO_ACTIVEMQ_TOPIC_ENABLE | /fcrepo/activemq/topic | true | If `true` publish JMS messages on the topic `FCREPO_ACTIVEMQ_TOPIC` |
| FCREPO_BINARYSTORAGE_TYPE | /fcrepo/binarystorage/type | file | The binary storage type. Only `file` and `s3` are supported at this time |
| FCREPO_AWS_REGION | /fcrepo/aws/region | us-east-1 | AWS Region for S3 Bucket |
| FCREPO_S3_BUCKET | /fcrepo/s3/bucket | | Bucket to use for S3 Storage |
| FCREPO_S3_USER | /fcrepo/s3/user | | AWS User for S3 Storage |
| FCREPO_S3_PASSWORD | /fcrepo/s3/password | | AWS Secret Token for S3 Storage |
| FCREPO_S3_PREFIX | /fcrepo/s3/prefix | | AWS Prefix for S3 Storage |
| FCREPO_PERSISTENCE_TYPE | /fcrepo/persistence/type | file | The object store type. Only `file`, `mysql`, `postgresql` are supported at this time |
| FCREPO_DISABLE_SYN | /fcrepo/disable/syn | false | Enable or disable authentication via [Syn](https://github.com/Islandora/Syn) |

To allow [external content] provide sites as key pairs. Wherein multiple values
is the url and the 'name' is a key that replaces the '*' symbol below.
Expand Down
7 changes: 7 additions & 0 deletions fcrepo6/rootfs/opt/tomcat/bin/setenv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,10 @@ fi
if [[ "${FCREPO_DISABLE_SYN}" == "true" ]]; then
export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.properties.management=relaxed"
fi

if [[ "${FCREPO_BINARYSTORAGE_TYPE}" == "file" ]]; then
export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.storage=ocfl-fs"
fi
if [[ "${FCREPO_BINARYSTORAGE_TYPE}" == "s3" ]]; then
export CATALINA_OPTS="${CATALINA_OPTS} -Dfcrepo.storage=ocfl-s3 -Dfcrepo.aws.region=${FCREPO_AWS_REGION} -Dfcrepo.aws.region=${FCREPO_S3_BUCKET} -Dfcrepo.aws.region=${FCREPO_S3_PREFIX}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the user name / password not need to be passed in as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably so. Hertzel was testing this today...

fi