Skip to content

Commit 1f38bbc

Browse files
committed
Implement comments
1 parent d57d68d commit 1f38bbc

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

.github/workflows/compose_test.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,15 @@ jobs:
5454
strategy:
5555
matrix:
5656
BE_VERSION: [v3, v4]
57-
FEATURE_ENABLED: ['', true]
57+
JOBS_ENABLED: ['', true]
58+
ELASTIC_ENABLED: ['', true]
59+
LDAP_ENABLED: ['', true]
5860
steps:
5961
- uses: actions/checkout@v4
6062
- name: Test compose.yaml
6163
run: |-
62-
export JOBS_ENABLED=${{ matrix.FEATURE_ENABLED }}
63-
export ELASTIC_ENABLED=${{ matrix.FEATURE_ENABLED }}
64-
export LDAP_ENABLED=${{ matrix.FEATURE_ENABLED }}
64+
export JOBS_ENABLED=${{ matrix.JOBS_ENABLED }}
65+
export ELASTIC_ENABLED=${{ matrix.ELASTIC_ENABLED }}
66+
export LDAP_ENABLED=${{ matrix.LDAP_ENABLED }}
6567
export BE_VERSION=${{ matrix.BE_VERSION }}
6668
docker compose --profile '*' up --wait --wait-timeout 300

services/backend/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,12 @@ The SciCat backend HTTP service.
55
## Dependency on `BE_VERSION`
66

77
The `BE_VERSION` value controls which version of the backend should be started, either [v3](./services/v3) or [v4](./services/v4) (default).
8+
9+
## Dependencies
10+
11+
Here below we show the internal dependencies of the service, which are not already covered [here](../../../../README.md) (if `B` depends on `A`, then we visualize as `A --> B`). The same subdomain to service convention applies.
12+
13+
```mermaid
14+
graph TD
15+
ldap --> backend
16+
```

services/backend/services/ldap/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ The OpenLDAP configuration is set by the [.env file](./config/.env).
99

1010
For an extensive list of available options see [here](https://hub.docker.com/r/bitnami/openldap).
1111

12+
You can add other users by editing the [ldif file](./config/ldifs/02-users.ldif).
13+
:warning: User creation is only done once, when the container is created.
14+
1215
## Default configuration
1316
The default configuration [.env file](./config/.env) creates the `dc=facility` domain with the following user:
1417

services/backend/services/v3/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,11 @@ If `LDAP_ENABLED` is toggled, you can use LDAP to log in with a [LDAP user](../l
7171

7272
## Dependencies
7373

74-
Here below we show the internal dependencies of the service, which are not already covered [here](../../../../README.md) (if `B` depends on `A`, then we visualize it as `A --> B`). The same subdomain to service convention applies.
74+
Here below we show the internal dependencies of the service, which are not already covered [here](../../../../README.md) and [here](../../README.md) (if `B` depends on `A`, then we visualize as `A --> B`). The same subdomain to service convention applies.
7575

7676
```mermaid
77-
graph TD
77+
graph TD
7878
rabbitmq --> archivemock
7979
rabbitmq --> backend
80-
ldap --> backend
8180
backend --> archivemock
8281
```

services/backend/services/v4/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,15 @@ In the default configuration folder [config](./config), the backend is set to us
2323

2424
## Enable additional features
2525

26-
Additionally, by setting the env variable `ELASTIC_ENABLED`, the [elastic search](./services/elastic/) service is started and the backend is configured to connect to them.
2726
Additionally, by setting the env variable `ELASTIC_ENABLED`, the [elastic search](./services/elastic/) service is started and the backend is configured to connect to them.
2827

2928
If `LDAP_ENABLED` is toggled, you can use LDAP to log in with a [LDAP user](../ldap/README.md#default-configuration).
3029

3130
## Dependencies
3231

33-
Here below we show the internal dependencies of the service, which are not already covered [here](../../../../README.md) (if `B` depends on `A`, then we visualize as `A --> B`). The same subdomain to service convention applies.
32+
Here below we show the internal dependencies of the service, which are not already covered [here](../../../../README.md) and [here](../../README.md) (if `B` depends on `A`, then we visualize as `A --> B`). The same subdomain to service convention applies.
3433

3534
```mermaid
3635
graph TD
3736
elasticsearch --> backend
38-
ldap --> backend
3937
```

0 commit comments

Comments
 (0)