Skip to content

Commit bec4170

Browse files
committed
Merge remote-tracking branch 'origin/v2.0.0-rc1' into main
2 parents e07486d + a3b79a1 commit bec4170

31 files changed

+2877
-25
lines changed

docs/src/.vuepress/layouts/PageLayout.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ function navigateToNewVersion() {
5555
<div class="version-selector" v-if="route.path.startsWith('/operations/')">
5656
<label class="vp-sidebar-header" for="version-select"><strong>Version:</strong> </label>
5757
<select id="version-select" class="vp-sidebar-header" v-model="version" @change="navigateToNewVersion">
58+
<option value="v2.0.0-RC1">2.0.0-RC1</option>
5859
<option value="v1.9.0">latest (1.9.0)</option>
5960
<option value="v1.8.0">1.8.0</option>
6061
<option value="v1.7.1">1.7.1</option>
@@ -70,7 +71,6 @@ function navigateToNewVersion() {
7071
<option value="v1.2.0">1.2.0</option>
7172
<option value="v1.1.0">1.1.0</option>
7273
<option value="v1.0.0">1.0.0</option>
73-
<option value="v2.0.0-M4">2.0.0-M4</option>
7474
</select></div>
7575
</template>
7676
<PageContent id="main-content" class="vp-page"/>
1.61 KB
Binary file not shown.
1.8 KB
Binary file not shown.

docs/src/.vuepress/sidebar/operations-v1.ts

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,76 @@
1+
export function generate_v2_latest_sidebar() {
2+
return [
3+
4+
{
5+
text: "Get Started",
6+
icon: "tool",
7+
link: "./",
8+
},
9+
"release-notes", "install", "upgrade-from-1", "allowList-mgm", "root-certificates", "passwords-secrets", {
10+
text: "FHIR Reverse Proxy",
11+
icon: "module",
12+
children: [
13+
{
14+
icon: "config",
15+
text: "Configuration",
16+
link: "fhir-reverse-proxy/configuration",
17+
}
18+
]},
19+
{
20+
text: "FHIR Server",
21+
icon: "module",
22+
prefix: "fhir/",
23+
link: "fhir/",
24+
children: [{
25+
icon: "config",
26+
text: "Configuration",
27+
link: "configuration"
28+
}, {
29+
icon: "config",
30+
text: "Access Control",
31+
link: "access-control"
32+
}, {
33+
icon: "config",
34+
text: "OpenID Connect",
35+
link: "oidc"
36+
}]
37+
}, {
38+
text: "BPE Reverse Proxy",
39+
icon: "module",
40+
children: [
41+
{
42+
icon: "config",
43+
text: "Configuration",
44+
link: "bpe-reverse-proxy/configuration",
45+
}
46+
]
47+
}, {
48+
text: "BPE Server",
49+
icon: "module",
50+
prefix: "bpe/",
51+
link: "bpe/",
52+
children: [{
53+
icon: "config",
54+
text: "Configuration",
55+
link: "configuration"
56+
}, {
57+
icon: "config",
58+
text: "Access Control",
59+
link: "access-control"
60+
}, {
61+
icon: "config",
62+
text: "OpenID Connect",
63+
link: "oidc"
64+
}]
65+
},
66+
{
67+
text: "Install Plugins",
68+
icon: "plugin",
69+
link: "install-plugins"
70+
}]
71+
}
72+
73+
174
export function generate_v1_latest_sidebar() {
275
return [
376

docs/src/.vuepress/theme.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { slimsearchPlugin } from "@vuepress/plugin-slimsearch";
22
import { hopeTheme } from "vuepress-theme-hope";
3-
import { generate_v1_latest_sidebar, generate_v1_gt_eq_1_7_0_sidebar, generate_v1_gt_eq_1_5_0_sidebar, generate_v1_gt_eq_1_0_0_sidebar } from "./sidebar/operations-v1";
3+
import { generate_v1_latest_sidebar, generate_v1_gt_eq_1_7_0_sidebar, generate_v1_gt_eq_1_5_0_sidebar, generate_v1_gt_eq_1_0_0_sidebar, generate_v2_latest_sidebar } from "./sidebar/operations-v1";
44

55
export default hopeTheme({
66
author: {
@@ -114,8 +114,7 @@ export default hopeTheme({
114114
"/operations/old-versions": [],
115115
"/operations/latest/": generate_v1_latest_sidebar(),
116116
"/operations/next/": [],
117-
"/operations/v2.0.0-M4/": [],
118-
"/operations/v2.0.0-M3/": [],
117+
"/operations/v2.0.0-RC1/": generate_v2_latest_sidebar(),
119118
"/operations/v1.9.0/": generate_v1_latest_sidebar(),
120119
"/operations/v1.8.0/": generate_v1_gt_eq_1_7_0_sidebar(),
121120
"/operations/v1.7.1/": generate_v1_gt_eq_1_7_0_sidebar(),

docs/src/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ features:
3333
---
3434
---
3535
# Data Sharing Framework
36-
The **Data Sharing Framework (DSF)** is a concept for a secure middleware to distribute data sharing processes based on the BPMN 2.0 and FHIR R4 standards. The DSF is used to support biomedical research with routine data, aiming to extract, merge, pseudonymize and provide data stored in multiple distributed organizations. Every participating site runs a FHIR endpoint accessible by other sites and a business process engine in the local secured network. The process engines execute BPMN processes in order to coordinate local and remote steps necessary to enable cross-site data sharing or feasibility analyses. This includes access to local data repositories, use-and-access-committee decision support, consent filtering, and privacy preserving record-linkage and pseudonymization. The aim is to enable secure and syntactically-, semantically- and process-interoperable data exchange across organizational boundaries. The secure communication infrastructure is funded by the German Federal Ministry of Education and Research within the Medical Informatics structure as *[DSF Community](https://www.gesundheitsforschung-bmbf.de/de/dsf-medizininformatik-struktur-data-sharing-framework-community-16133.php)*.
36+
The **Data Sharing Framework (DSF)** is a concept for a secure middleware to distribute data sharing processes based on the BPMN 2.0 and FHIR R4 standards. The DSF is used to support biomedical research with routine data, aiming to extract, merge, pseudonymize and provide data stored in multiple distributed organizations. Every participating site runs a FHIR endpoint accessible by other sites and a business process engine in the local secured network. The process engines execute BPMN processes in order to coordinate local and remote steps necessary to enable cross-site data sharing or feasibility analysis. This includes access to local data repositories, use-and-access-committee decision support, consent filtering, and privacy preserving record-linkage and pseudonymization. The aim is to enable secure and syntactically-, semantically- and process-interoperable data exchange across organizational boundaries. The secure communication infrastructure is funded by the German Federal Ministry of Education and Research within the Medical Informatics structure as *[DSF Community](https://www.gesundheitsforschung-bmbf.de/de/dsf-medizininformatik-struktur-data-sharing-framework-community-16133.php)*.
3737

3838
![DSF concept](/photos/info/introduction/dsf-concept.png)
3939

@@ -52,7 +52,7 @@ The Data Sharing Framework is entering an exciting new phase. With the upcoming
5252
---
5353

5454
**DSF 2.0 Announcement**
55-
We’re excited to announce that the next major release, DSF 2.0, is currently in development! This update brings significant improvements and new features designed to enhance performance and usability. This article is a summary on what to expect in the upcoming release. Upcomming datails will be available under [Operations](operations/v2.0.0-M3/index.md)
55+
We’re excited to announce that the next major release, DSF 2.0, is currently in development! This update brings significant improvements and new features designed to enhance performance and usability. This article is a summary on what to expect in the upcoming release. Upcoming details will be available under [Operations](operations/v2.0.0-RC1/index.md)
5656
[Read more](/posts/2025-07-28-dsfv2-announcement)
5757

5858
---

docs/src/operations/v1.9.0/bpe-reverse-proxy/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ icon: config
8989
### SSL_EXPECTED_CLIENT_I_DN_CN_VALUES
9090
- **Required:** No
9191
- **Description:** Expected client certificate issuer DN common-name `CN` values, must be a comma-separated list of strings in single quotation marks. If a client certificate from a not configured issuing ca common-name is used, the server answers with a `403 Forbidden` status code
92-
- **Default:** `'GEANT TLS ECC 1', 'HARICA OV TLS ECC', 'GEANT TLS RSA 1', 'HARICA OV TLS RSA', 'GEANT S/MIME ECC 1', 'HARICA S/MIME ECC', 'GEANT S/MIME RSA 1', 'HARICA S/MIME RSA', 'DFN-Verein Global Issuing CA', 'Fraunhofer User CA - G02', 'D-TRUST SSL Class 3 CA 1 2009', 'Sectigo RSA Organization Validation Secure Server CA', 'GEANT OV RSA CA 4', 'GEANT Personal CA 4', 'GEANT eScience Personal CA 4', 'Sectigo ECC Organization Validation Secure Server CA', 'GEANT OV ECC CA 4', 'GEANT Personal ECC CA 4', 'GEANT eScience Personal ECC CA 4', 'D-TRUST Limited Basic CA 1-2 2019', 'D-TRUST Limited Basic CA 1-3 2019'`
92+
- **Default:** `'GEANT TLS ECC 1', 'HARICA OV TLS ECC', 'GEANT TLS RSA 1', 'HARICA OV TLS RSA', 'GEANT S/MIME ECC 1', 'HARICA Client Authentication ECC', 'HARICA S/MIME ECC', 'GEANT S/MIME RSA 1', 'HARICA Client Authentication RSA', 'HARICA S/MIME RSA', 'DFN-Verein Global Issuing CA', 'Fraunhofer User CA - G02', 'D-TRUST SSL Class 3 CA 1 2009', 'Sectigo RSA Organization Validation Secure Server CA', 'GEANT OV RSA CA 4', 'GEANT Personal CA 4', 'GEANT eScience Personal CA 4', 'Sectigo ECC Organization Validation Secure Server CA', 'GEANT OV ECC CA 4', 'GEANT Personal ECC CA 4', 'GEANT eScience Personal ECC CA 4', 'D-TRUST Limited Basic CA 1-2 2019', 'D-TRUST Limited Basic CA 1-3 2019'`
9393

9494

9595
### SSL_VERIFY_CLIENT

docs/src/operations/v1.9.0/fhir-reverse-proxy/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ icon: config
8989
### SSL_EXPECTED_CLIENT_I_DN_CN_VALUES
9090
- **Required:** No
9191
- **Description:** Expected client certificate issuer DN common-name `CN` values, must be a comma-separated list of strings in single quotation marks. If a client certificate from a not configured issuing ca common-name is used, the server answers with a `403 Forbidden` status code
92-
- **Default:** `'GEANT TLS ECC 1', 'HARICA OV TLS ECC', 'GEANT TLS RSA 1', 'HARICA OV TLS RSA', 'GEANT S/MIME ECC 1', 'HARICA S/MIME ECC', 'GEANT S/MIME RSA 1', 'HARICA S/MIME RSA', 'DFN-Verein Global Issuing CA', 'Fraunhofer User CA - G02', 'D-TRUST SSL Class 3 CA 1 2009', 'Sectigo RSA Organization Validation Secure Server CA', 'GEANT OV RSA CA 4', 'GEANT Personal CA 4', 'GEANT eScience Personal CA 4', 'Sectigo ECC Organization Validation Secure Server CA', 'GEANT OV ECC CA 4', 'GEANT Personal ECC CA 4', 'GEANT eScience Personal ECC CA 4', 'D-TRUST Limited Basic CA 1-2 2019', 'D-TRUST Limited Basic CA 1-3 2019'`
92+
- **Default:** `'GEANT TLS ECC 1', 'HARICA OV TLS ECC', 'GEANT TLS RSA 1', 'HARICA OV TLS RSA', 'GEANT S/MIME ECC 1', 'HARICA Client Authentication ECC', 'HARICA S/MIME ECC', 'GEANT S/MIME RSA 1', 'HARICA Client Authentication RSA', 'HARICA S/MIME RSA', 'DFN-Verein Global Issuing CA', 'Fraunhofer User CA - G02', 'D-TRUST SSL Class 3 CA 1 2009', 'Sectigo RSA Organization Validation Secure Server CA', 'GEANT OV RSA CA 4', 'GEANT Personal CA 4', 'GEANT eScience Personal CA 4', 'Sectigo ECC Organization Validation Secure Server CA', 'GEANT OV ECC CA 4', 'GEANT Personal ECC CA 4', 'GEANT eScience Personal ECC CA 4', 'D-TRUST Limited Basic CA 1-2 2019', 'D-TRUST Limited Basic CA 1-3 2019'`
9393

9494

9595
### SSL_VERIFY_CLIENT

docs/src/operations/v2.0.0-M3/index.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

docs/src/operations/v2.0.0-M4/index.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)