Skip to content

Commit

Permalink
Use s3 integrator (#373)
Browse files Browse the repository at this point in the history
  • Loading branch information
arturo-seijas authored Apr 10, 2024
1 parent 9e7d597 commit 35f8aea
Show file tree
Hide file tree
Showing 23 changed files with 1,236 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
with:
load-test-enabled: false
load-test-run-args: "-e LOAD_TEST_HOST=localhost"
modules: '["test_actions.py", "test_charm.py", "test_saml.py"]'
modules: '["test_actions.py", "test_charm.py", "test_s3.py", "test_saml.py"]'
trivy-fs-enabled: true
trivy-image-config: "trivy.yaml"
zap-before-command: "curl -H \"Host: indico.local\" http://localhost/bootstrap --data-raw 'csrf_token=00000000-0000-0000-0000-000000000000&first_name=admin&last_name=admin&email=admin%40admin.com&username=admin&password=lunarlobster&confirm_password=lunarlobster&affiliation=Canonical'"
Expand Down
5 changes: 0 additions & 5 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,3 @@ options:
type: string
description: URL through which Indico is accessed by users.
default: ''
s3_storage:
type: string
description: Comma separated list of parameters to connect to an S3 bucket as in 's3:bucket=my-indico-test-bucket,access_key=12345,secret_key=topsecret'. Details on the available options can be found at https://github.com/indico/indico-plugins/blob/master/storage_s3/README.md#available-config-options
default: ''

6 changes: 2 additions & 4 deletions docs/how-to/configure-s3.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# How to configure S3

An S3 bucket can be leveraged to serve the static content uploaded to Indico, potentially improving performance. Moreover, it is required when scaling the charm to serve the uploaded files. To configure it to set the appropriate connection parameters in `s3_storage` for your existing bucket `juju config [charm_name] s3_storage=[value]`.
An S3 bucket can be leveraged to serve the static content uploaded to Indico, potentially improving performance. Moreover, it is required when scaling the charm to serve the uploaded files.

The configuration option `s3_storage` accepts a comma separated list of parameters as in 's3:bucket=my-indico-test-bucket,access_key=12345,secret_key=topsecret'. More details can be found [in Indico's storage S3 documentation](https://github.com/indico/indico-plugins/blob/master/storage_s3/README.md#available-config-options).

For more details on the configuration options and their default values see the [configuration reference](https://charmhub.io/indico/configure).
To configure Indico's S3 integration you'll have to deploy the [S3 Integrator charm](https://charmhub.io/s3-integrator/docs/tutorial-getting-started) and integrate it with Indico by running `juju integrate indico s3-integrator`.
Loading

0 comments on commit 35f8aea

Please sign in to comment.