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.

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

docs: add missing configurations #1000

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
28 changes: 28 additions & 0 deletions sda/cmd/finalize/finalize.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ These settings control how `finalize` connects to the RabbitMQ message broker.
- `BROKER_USER`: username to connect to RabbitMQ
- `BROKER_PASSWORD`: password to connect to RabbitMQ
- `BROKER_PREFETCHCOUNT`: Number of messages to pull from the message server at the time (default to `2`)
- `BROKER_EXCHANGE`= the exchange name (i.e., `sda`)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
- `BROKER_EXCHANGE`= the exchange name (i.e., `sda`)
- `BROKER_EXCHANGE`: the exchange name (i.e., `sda`)

Follow the existing syntax

Copy link
Collaborator

Choose a reason for hiding this comment

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

The setting BROKER_EXCHANGE is only needed if the MQ is configured in that way.
Do not use the preconfigured MQ and DB as templates since they are not designed to be used in a production setting.


### PostgreSQL Database settings

Expand Down Expand Up @@ -126,3 +127,30 @@ and if `*_TYPE` is `POSIX`:

- `*_LOCATION`: POSIX path to use as storage root

### Required settings (Example)

The following configuration variables are essential for a successful setup.

- `BROKER_HOST`=
- `BROKER_PORT`=
- `BROKER_USER`=
- `BROKER_PASSWORD`=
- `BROKER_VHOST`=
- `BROKER_QUEUE`=
- `BROKER_EXCHANGE`=
- `BROKER_ROUTINGKEY`=
- `BROKER_ROUTINGERROR`=
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
- `BROKER_ROUTINGERROR`=

ROUTINGERROR is being deprecated

- `BROKER_SSL`=
- `BROKER_VERIFYPEER`=
- `BROKER_CACERT`=
- `BROKER_CLIENTCERT`=
- `BROKER_CLIENTKEY`=
Comment on lines +144 to +147
Copy link
Contributor

Choose a reason for hiding this comment

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

only if tls is enabled

Comment on lines +144 to +147
Copy link
Collaborator

Choose a reason for hiding this comment

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

Only if BROKER_SSL=true

- `DB_HOST`=
- `DB_PORT`=
- `DB_USER`=
- `DB_PASSWORD`=
- `DB_DATABASE`=
- `DB_SSLMODE`=
- `DB_CLIENTCERT`=
- `DB_CLIENTKEY`=
Comment on lines +154 to +155
Copy link
Contributor

Choose a reason for hiding this comment

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

only if tls in enabled.

Comment on lines +154 to +155
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
- `DB_CLIENTCERT`=
- `DB_CLIENTKEY`=
- `DB_CLIENTCERT`=
- `DB_CLIENTKEY`=
- `DB_CACERT`=

Only if DB_SSLMODE= is anything than disable

- `LOG_LEVEL`=
35 changes: 35 additions & 0 deletions sda/cmd/ingest/ingest.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ These settings control how `ingest` connects to the RabbitMQ message broker.
- `BROKER_USER`: username to connect to RabbitMQ
- `BROKER_PASSWORD`: password to connect to RabbitMQ
- `BROKER_PREFETCHCOUNT`: Number of messages to pull from the message server at the time (default to `2`)
- `BROKER_EXCHANGE`= the exchange name (i.e., `sda`)

### PostgreSQL Database settings:

Expand Down Expand Up @@ -139,3 +140,37 @@ and if `*_TYPE` is `POSIX`:
- `error`
- `fatal`
- `panic`

### Required settings (Example)

The following configuration variables are essential for a successful setup.

- `ARCHIVE_TYPE`=
- `ARCHIVE_LOCATION`=
- `BROKER_HOST`=
- `BROKER_PORT`=
- `BROKER_USER`=
- `BROKER_PASSWORD`=
- `BROKER_VHOST`=
- `BROKER_QUEUE`=
- `BROKER_EXCHANGE`=
- `BROKER_ROUTINGKEY`=
- `BROKER_ROUTINGERROR`=
- `BROKER_SSL`=
- `BROKER_VERIFYPEER`=
- `BROKER_CACERT`=
- `BROKER_CLIENTCERT`=
- `BROKER_CLIENTKEY`=
- `C4GH_PASSPHRASE`=
- `C4GH_FILEPATH`=
- `DB_HOST`=
- `DB_PORT`=
- `DB_USER`=
- `DB_PASSWORD`=
- `DB_DATABASE`=
- `DB_SSLMODE`=
- `DB_CLIENTCERT`=
- `DB_CLIENTKEY`=
- `INBOX_TYPE`=
- `INBOX_LOCATION`=
- `LOG_LEVEL`=
37 changes: 37 additions & 0 deletions sda/cmd/intercept/intercept.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,23 @@ These settings control how `intercept` connects to the RabbitMQ message broker.
- `BROKER_QUEUE`: message queue to read messages from (commonly: `from_cega`)
- `BROKER_USER`: username to connect to RabbitMQ
- `BROKER_PASSWORD`: password to connect to RabbitMQ
- `BROKER_VHOST`= the virtual host of the exchange (i.e., `test`)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
- `BROKER_VHOST`= the virtual host of the exchange (i.e., `test`)
- `BROKER_VHOST`= the virtual host to connect to

- `BROKER_EXCHANGE`= the exchange name (i.e., `sda`)

### PostgreSQL Database settings:

- `DB_HOST`: hostname for the postgresql database
- `DB_PORT`: database port (commonly: `5432`)
- `DB_USER`: username for the database
- `DB_PASSWORD`: password for the database
- `DB_DATABASE`: database name (i.e., `sda`)
- `DB_SSLMODE`: The TLS encryption policy to use for database connections ([See Docs](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-PROTECTION)), valid options are:
- `disable`
- `allow`
- `prefer`
- `require`
- `verify-ca`
- `verify-full`

### Logging settings

Expand All @@ -61,3 +78,23 @@ These settings control how `intercept` connects to the RabbitMQ message broker.
- `error`
- `fatal`
- `panic`

### Required settings (Example)

The following configuration variables are essential for a successful setup.

- `BROKER_HOST`=
- `BROKER_PORT`=
- `BROKER_USER`=
- `BROKER_PASSWORD`=
- `BROKER_QUEUE`=
- `BROKER_VHOST`=
- `BROKER_EXCHANGE`=
- `DB_HOST`=
- `DB_PORT`=
- `DB_USER`=
- `DB_PASSWORD`=
- `DB_DATABASE`=
- `DB_SSLMODE`=
- `LOG_LEVEL`=

31 changes: 30 additions & 1 deletion sda/cmd/mapper/mapper.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ These settings control how `mapper` connects to the RabbitMQ message broker.
- `BROKER_USER`: username to connect to RabbitMQ
- `BROKER_PASSWORD`: password to connect to RabbitMQ
- `BROKER_PREFETCHCOUNT`: Number of messages to pull from the message server at the time (default to `2`)
- `BROKER_EXCHANGE`= the exchange name (i.e., `sda`)

### PostgreSQL Database settings

Expand Down Expand Up @@ -115,4 +116,32 @@ and if `*_TYPE` is `POSIX`:
- `warn` (or `warning`)
- `error`
- `fatal`
- `panic`
- `panic`

### Required settings (Example)

The following configuration variables are essential for a successful setup.

- `BROKER_HOST`=
- `BROKER_PORT`=
- `BROKER_USER`=
- `BROKER_PASSWORD`=
- `BROKER_VHOST`=
- `BROKER_QUEUE`=
- `BROKER_EXCHANGE`=
- `BROKER_ROUTINGERROR`=
- `BROKER_SSL`=
- `BROKER_VERIFYPEER`=
- `BROKER_CACERT`=
- `BROKER_CLIENTCERT`=
- `BROKER_CLIENTKEY`=
- `DB_HOST`=
- `DB_PORT`=
- `DB_USER`=
- `DB_PASSWORD`=
- `DB_DATABASE`=
- `DB_SSLMODE`=
- `DB_CLIENTCERT`=
- `DB_CLIENTKEY`=
- `LOG_LEVEL`=
- `INBOX_LOCATION`=
34 changes: 34 additions & 0 deletions sda/cmd/verify/verify.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ These settings control how `verify` connects to the RabbitMQ message broker.
- `BROKER_USER`: username to connect to RabbitMQ
- `BROKER_PASSWORD`: password to connect to RabbitMQ
- `BROKER_PREFETCHCOUNT`: Number of messages to pull from the message server at the time (default to `2`)
- `BROKER_EXCHANGE`= the exchange name (i.e., `sda`)

### PostgreSQL Database settings

Expand Down Expand Up @@ -142,3 +143,36 @@ and if `*_TYPE` is `POSIX`:
- `error`
- `fatal`
- `panic`

### Required settings (Example)

The following configuration variables are essential for a successful setup.

- `ARCHIVE_TYPE`=
- `ARCHIVE_LOCATION`=
- `BROKER_HOST`=
- `BROKER_PORT`=
- `BROKER_USER`=
- `BROKER_PASSWORD`=
- `BROKER_VHOST`=
- `BROKER_QUEUE`=
- `BROKER_EXCHANGE`=
- `BROKER_ROUTINGKEY`=
- `BROKER_ROUTINGERROR`=
- `BROKER_SSL`=
- `BROKER_VERIFYPEER`=
- `BROKER_CACERT`=
- `BROKER_CLIENTCERT`=
- `BROKER_CLIENTKEY`=
- `C4GH_PASSPHRASE`=
- `C4GH_FILEPATH`=
- `DB_HOST`=
- `DB_PORT`=
- `DB_USER`=
- `DB_PASSWORD`=
- `DB_DATABASE`=
- `DB_SSLMODE`=
- `DB_CLIENTCERT`=
- `DB_CLIENTKEY`=
- `INBOX_LOCATION`=
- `LOG_LEVEL`=