From 0322c4ca4a96b8bff1379416777d2d96f13c7324 Mon Sep 17 00:00:00 2001 From: "Noah W. Smith" Date: Wed, 31 Mar 2021 16:54:36 -0400 Subject: [PATCH 1/3] Accept parameters for s3 storage --- fcrepo6/rootfs/opt/tomcat/bin/setenv.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fcrepo6/rootfs/opt/tomcat/bin/setenv.sh b/fcrepo6/rootfs/opt/tomcat/bin/setenv.sh index 19f23863..ed2b33bc 100644 --- a/fcrepo6/rootfs/opt/tomcat/bin/setenv.sh +++ b/fcrepo6/rootfs/opt/tomcat/bin/setenv.sh @@ -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}" +fi From 1155da64406e5c839d2a59f4555921b266f7bd81 Mon Sep 17 00:00:00 2001 From: "Noah W. Smith" Date: Wed, 31 Mar 2021 16:59:29 -0400 Subject: [PATCH 2/3] Documenting available values for S3 --- fcrepo6/README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fcrepo6/README.md b/fcrepo6/README.md index fc197077..90c6c51e 100644 --- a/fcrepo6/README.md +++ b/fcrepo6/README.md @@ -37,7 +37,12 @@ additional settings, volumes, ports, etc. | 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_BINARYSTORAGE_TYPE | /fcrepo/binarystorage/type | file | The binary storage type. Only `file` and `s3` are supported at this time | +| FCREPO_AWS_REGION | | us-east-1 | AWS Region for S3 Bucket | +| FCREPO_S3_BUCKET | | | Bucket to use for S3 Storage | +| FCREPO_S3_USER | | | AWS User for S3 Storage | +| FCREPO_S3_PASSWORD | | | AWS Secret Token for S3 Storage | +| 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) | From c71e8bf3e025e7addd537a4148ce22cddf6aab8c Mon Sep 17 00:00:00 2001 From: Nigel Banks Date: Thu, 1 Apr 2021 19:49:08 +0100 Subject: [PATCH 3/3] Fix formatting in documentation --- fcrepo6/README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/fcrepo6/README.md b/fcrepo6/README.md index 90c6c51e..a0c68e79 100644 --- a/fcrepo6/README.md +++ b/fcrepo6/README.md @@ -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 @@ -30,21 +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_AWS_REGION | | us-east-1 | AWS Region for S3 Bucket | -| FCREPO_S3_BUCKET | | | Bucket to use for S3 Storage | -| FCREPO_S3_USER | | | AWS User for S3 Storage | -| FCREPO_S3_PASSWORD | | | AWS Secret Token for S3 Storage | -| 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) | +| 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.