Merge branch 'feat/idp' into feat/tls

# Conflicts: # DEPENDENCIES_FRONTEND # docs/adminGuide/Admin_Guide.md # frontend/DEPENDENCIES # frontend/package-lock.json # frontend/package.json # frontend/src/App.vue # frontend/src/main.js # frontend/src/router/index.js # frontend/src/services/AuthenticationService.js # local/keycloak/INSTALL.md # local/keycloak/puris-config/Catena-X-realm.json # local/keycloak/puris-config/Catena-X-users-0.json # local/miw/keycloak-setup.json
eclipse-tractusx · Dec 15, 2023 · e6c0f9d · e6c0f9d
2 parents 6cafb03 + 35b79e8
commit e6c0f9d
Show file tree

Hide file tree

Showing 68 changed files with 1,194 additions and 2,285 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -26,5 +26,5 @@ indent_size = 4
 indent_style = space
 insert_final_newline = true
 
-[*.yml]
+[*.yaml]
 indent_size = 2
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -80,6 +80,8 @@ jobs:
           queries: +security-extended,security-and-quality
 
       - name: Setup java for backend
+        # Ensures that the workflow only runs for 'java'
+        if: ${{ matrix.language == 'java' }}
         uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
         with:
           java-version: 17
@@ -88,6 +90,7 @@ jobs:
           cache: maven
 
       # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+      # Automates dependency installation for Python, Ruby, and JavaScript, optimizing the CodeQL analysis setup.
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
         uses: github/codeql-action/autobuild@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.227

diff --git a/DEPENDENCIES_FRONTEND b/DEPENDENCIES_FRONTEND
@@ -65,8 +65,10 @@ npm/npmjs/-/eslint-config-prettier/8.5.0, MIT, approved, clearlydefined
 npm/npmjs/-/eslint-plugin-prettier/4.2.1, MIT, approved, clearlydefined
 npm/npmjs/-/eslint-plugin-vue/9.18.1, MIT, approved, #11440
 npm/npmjs/-/eslint-scope/7.2.2, BSD-2-Clause, approved, #9916
+npm/npmjs/-/eslint-utils/3.0.0, MIT, approved, #2431
+npm/npmjs/-/eslint-visitor-keys/2.1.0, Apache-2.0, approved, #2433
 npm/npmjs/-/eslint-visitor-keys/3.4.3, Apache-2.0, approved, #7729
-npm/npmjs/-/eslint/8.54.0, MIT AND (LGPL-2.0-or-later AND MIT) AND ISC AND OFL-1.1 AND CC-BY-SA-2.0 AND (LicenseRef-scancode-proprietary-license AND MIT), restricted, #11618
+npm/npmjs/-/eslint/8.19.0, MIT, approved, #5874
 npm/npmjs/-/espree/9.6.1, BSD-2-Clause AND BSD-3-Clause AND MIT AND BSD-2-Clause, approved, #9308
 npm/npmjs/-/esquery/1.5.0, BSD-3-Clause, approved, #7469
 npm/npmjs/-/esrecurse/4.3.0, BSD-2-Clause, approved, clearlydefined
@@ -81,19 +83,18 @@ npm/npmjs/-/fast-levenshtein/2.0.6, MIT, approved, #2428
 npm/npmjs/-/fastq/1.13.0, ISC, approved, clearlydefined
 npm/npmjs/-/file-entry-cache/6.0.1, MIT, approved, clearlydefined
 npm/npmjs/-/fill-range/7.0.1, MIT, approved, clearlydefined
-npm/npmjs/-/find-up/5.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/flat-cache/3.0.4, MIT, approved, clearlydefined
 npm/npmjs/-/flatted/3.2.6, ISC AND (ISC AND MIT), approved, #2430
 npm/npmjs/-/fraction.js/4.2.0, MIT, approved, clearlydefined
 npm/npmjs/-/fs.realpath/1.0.0, ISC, approved, clearlydefined
 npm/npmjs/-/fsevents/2.3.2, MIT, approved, #2967
 npm/npmjs/-/function-bind/1.1.1, MIT, approved, #11063
+npm/npmjs/-/functional-red-black-tree/1.0.1, MIT, approved, clearlydefined
 npm/npmjs/-/glob-parent/5.1.2, ISC, approved, clearlydefined
 npm/npmjs/-/glob-parent/6.0.2, ISC, approved, clearlydefined
 npm/npmjs/-/glob/7.2.3, ISC, approved, clearlydefined
-npm/npmjs/-/globals/13.23.0, MIT, approved, clearlydefined
+npm/npmjs/-/globals/13.24.0, MIT, approved, #11962
 npm/npmjs/-/good-listener/1.2.2, MIT, approved, clearlydefined
-npm/npmjs/-/graphemer/1.4.0, MIT, approved, clearlydefined
 npm/npmjs/-/has-flag/4.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/has/1.0.3, MIT, approved, #10930
 npm/npmjs/-/ignore/5.3.0, MIT, approved, #11665
@@ -106,17 +107,15 @@ npm/npmjs/-/is-core-module/2.9.0, MIT, approved, clearlydefined
 npm/npmjs/-/is-extglob/2.1.1, MIT, approved, clearlydefined
 npm/npmjs/-/is-glob/4.0.3, MIT, approved, clearlydefined
 npm/npmjs/-/is-number/7.0.0, MIT, approved, clearlydefined
-npm/npmjs/-/is-path-inside/3.0.3, MIT, approved, clearlydefined
 npm/npmjs/-/isexe/2.0.0, ISC, approved, clearlydefined
 npm/npmjs/-/js-sha256/0.10.1, MIT, approved, clearlydefined
 npm/npmjs/-/js-yaml/4.1.0, MIT, approved, clearlydefined
 npm/npmjs/-/json-schema-traverse/0.4.1, MIT, approved, clearlydefined
 npm/npmjs/-/json-stable-stringify-without-jsonify/1.0.1, MIT, approved, clearlydefined
 npm/npmjs/-/jwt-decode/4.0.0, MIT, approved, clearlydefined
-npm/npmjs/-/keycloak-js/23.0.0, Apache-2.0 AND (Apache-2.0 AND GPL-2.0-or-later) AND LicenseRef-scancode-public-domain-disclaimer AND MIT AND (BSD-2-Clause AND BSD-3-Clause AND CC-BY-2.5 AND FSFAP AND MPL-2.0) AND (BSD-3-Clause AND MIT) AND (Apache-2.0 AND LGPL-2.0-or-later) AND (AFL-2.1 AND AFL-3.0 AND LGPL-2.0-only) AND EPL-1.0 AND W3C-19980720 AND LicenseRef-scancode-oasis-ws-security-spec AND W3C AND LicenseRef-scancode-ws-policy-specification AND (Apache-2.0 AND LicenseRef-scancode-bitzi-pd) AND (Apache-2.0 AND MIT) AND (Apache-2.0 AND MIT AND MPL-1.0), restricted, #11737
+npm/npmjs/-/keycloak-js/23.0.0, Apache-2.0 AND MIT AND EPL-1.0 AND LicenseRef-scancode-oasis-ws-security-spec AND W3C AND LicenseRef-scancode-ws-policy-specification AND W3C AND W3C-19980720 AND (AFL-2.1 OR LGPL-2.0-only) AND (Apache-2.0 AND MIT) AND (Apache-2.0 AND MIT), approved, #11737
 npm/npmjs/-/levn/0.4.1, MIT, approved, clearlydefined
 npm/npmjs/-/lilconfig/2.0.5, MIT, approved, clearlydefined
-npm/npmjs/-/locate-path/6.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/lodash.merge/4.6.2, MIT, approved, clearlydefined
 npm/npmjs/-/lodash/4.17.21, CC0-1.0 AND MIT, approved, #2096
 npm/npmjs/-/lru-cache/6.0.0, ISC, approved, clearlydefined
@@ -135,10 +134,7 @@ npm/npmjs/-/nth-check/2.1.1, BSD-2-Clause, approved, clearlydefined
 npm/npmjs/-/object-hash/3.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/once/1.4.0, ISC, approved, clearlydefined
 npm/npmjs/-/optionator/0.9.3, MIT, approved, #9208
-npm/npmjs/-/p-limit/3.1.0, MIT, approved, clearlydefined
-npm/npmjs/-/p-locate/5.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/parent-module/1.0.1, MIT, approved, clearlydefined
-npm/npmjs/-/path-exists/4.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/path-is-absolute/1.0.1, MIT, approved, clearlydefined
 npm/npmjs/-/path-key/3.1.1, MIT, approved, clearlydefined
 npm/npmjs/-/path-parse/1.0.7, MIT, approved, clearlydefined
@@ -160,6 +156,7 @@ npm/npmjs/-/queue-microtask/1.2.3, MIT, approved, clearlydefined
 npm/npmjs/-/quick-lru/5.1.1, MIT, approved, clearlydefined
 npm/npmjs/-/read-cache/1.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/readdirp/3.6.0, MIT, approved, #2977
+npm/npmjs/-/regexpp/3.2.0, MIT, approved, clearlydefined
 npm/npmjs/-/resolve-from/4.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/resolve/1.22.1, MIT AND ISC, approved, #2409
 npm/npmjs/-/reusify/1.0.4, MIT, approved, clearlydefined
@@ -186,6 +183,7 @@ npm/npmjs/-/type-fest/0.20.2, MIT OR (CC0-1.0 AND MIT), approved, clearlydefined
 npm/npmjs/-/update-browserslist-db/1.0.4, MIT, approved, #8237
 npm/npmjs/-/uri-js/4.4.1, BSD-2-Clause, approved, #1086
 npm/npmjs/-/util-deprecate/1.0.2, MIT, approved, #5885
+npm/npmjs/-/v8-compile-cache/2.4.0, MIT, approved, clearlydefined
 npm/npmjs/-/vite/2.9.16, MIT AND ISC AND Apache-2.0 AND BSD-2-Clause AND CC0-1.0 AND (BSD-3-Clause OR GPL-2.0-only), approved, #5873
 npm/npmjs/-/vue-eslint-parser/9.3.2, MIT, approved, #11439
 npm/npmjs/-/vue-json-viewer/3.0.4, MIT, approved, #5870
@@ -197,21 +195,16 @@ npm/npmjs/-/xml-name-validator/4.0.0, Apache-2.0, approved, clearlydefined
 npm/npmjs/-/xtend/4.0.2, MIT, approved, clearlydefined
 npm/npmjs/-/yallist/4.0.0, ISC, approved, clearlydefined
 npm/npmjs/-/yaml/1.10.2, ISC, approved, clearlydefined
-npm/npmjs/-/yocto-queue/0.1.0, MIT, approved, clearlydefined
 npm/npmjs/@aashutoshrathi/word-wrap/1.2.6, MIT, approved, #9212
 npm/npmjs/@babel/parser/7.18.6, MIT, approved, clearlydefined
 npm/npmjs/@eslint-community/eslint-utils/4.4.0, MIT, approved, #8032
-npm/npmjs/@eslint-community/regexpp/4.10.0, MIT, approved, clearlydefined
-npm/npmjs/@eslint/eslintrc/2.1.3, MIT, approved, #9908
-npm/npmjs/@eslint/js/8.54.0, MIT AND (LGPL-2.0-or-later AND MIT) AND ISC AND OFL-1.1 AND CC-BY-SA-2.0 AND (LicenseRef-scancode-proprietary-license AND MIT), restricted, #11617
-npm/npmjs/@humanwhocodes/config-array/0.11.13, Apache-2.0, approved, #5876
-npm/npmjs/@humanwhocodes/module-importer/1.0.1, Apache-2.0, approved, clearlydefined
-npm/npmjs/@humanwhocodes/object-schema/2.0.1, BSD-3-Clause, approved, clearlydefined
+npm/npmjs/@eslint/eslintrc/1.4.1, MIT, approved, #5909
+npm/npmjs/@humanwhocodes/config-array/0.9.5, Apache-2.0, approved, clearlydefined
+npm/npmjs/@humanwhocodes/object-schema/1.2.1, BSD-3-Clause, approved, clearlydefined
 npm/npmjs/@nodelib/fs.scandir/2.1.5, MIT, approved, clearlydefined
 npm/npmjs/@nodelib/fs.stat/2.0.5, MIT, approved, clearlydefined
 npm/npmjs/@nodelib/fs.walk/1.2.8, MIT, approved, clearlydefined
 npm/npmjs/@rushstack/eslint-patch/1.1.4, MIT, approved, clearlydefined
-npm/npmjs/@ungap/structured-clone/1.2.0, ISC, approved, clearlydefined
 npm/npmjs/@vitejs/plugin-vue/2.3.3, MIT, approved, clearlydefined
 npm/npmjs/@vue/compiler-core/3.2.37, MIT, approved, #7097
 npm/npmjs/@vue/compiler-dom/3.2.37, MIT, approved, #7093

diff --git a/INSTALL.md b/INSTALL.md
@@ -1,13 +1,56 @@
 ## Project Installation
-### Running using mvn (local develpment) or Running using docker (deployment)
+### Running for development using mvn/npm or using docker
 See the `INSTALL.md` files in the [backend](./backend/INSTALL.md) and [frontend](./frontend/INSTALL.md) folder.
+### Running local integration testing user docker compose
+See `Install.md` file in folder [local](./local/docker-compose.yaml) for integration testing environment with two deployed applications and EDCs.
 ### Running using helm (deployment)
-1. Run the application:
+1. Configure the application:
+    1. Open the `values.yaml` file in [charts/puris](./charts/puris/values.yaml).
+    2. Edit the following properties to your requirements:
+        - **Ingress**(if you want to enable ingress) for frontend/backend, under *frontend.ingress.* and *backend.ingress.*
+        - **EDC**, under *backend.puris.edc*
+        - **Own data**, under *backend.puris.own*
+        - **Current role for demonstrator**, under *backend.puris.demonstrator.role*
+    > **NOTE**   
+    Further information on the individual properties can be found in the following [README.md](./charts/puris/README.md).
+
+#### Run without Ingress 
+
+2. Run the application:
 ```shell
-cd charts/puris/
+helm install puris charts/puris \
+    --namespace puris \
+    --create-namespace 
+```
+3. Forward ports for services:
+```shell
+kubectl -n puris port-forward svc/frontend 8080:8080
+kubectl -n puris port-forward svc/backend 8081:8081
+```
+4. Done! The applications should be available at `http://localhost:<forwarded-port>`.
 
-helm install puris --namespace puris --create-namespace . --set frontend.ingress.enabled=true --set backend.ingress.enabled=true
+#### Run with Ingress
+
+Precondition: please refer to your runtime environment's official documentation on how to enable ingress.
+- [minikube](https://kubernetes.io/docs/tasks/access-application-cluster/ingress-minikube/)
+- [kind](https://kind.sigs.k8s.io/docs/user/ingress/)
+
+2. Run the application:
+```shell
+helm install puris charts/puris \
+    --namespace puris \
+    --create-namespace \
+    --set frontend.ingress.enabled=true \
+    --set backend.ingress.enabled=true
+```
+3. Edit /etc/hosts:
+```shell
+# If you are using minikube use minikube ip to get you clusterIp, for kind this is localhost (127.0.0.1)
+sudo vim /etc/hosts
+>> add entry for frontend "<cluster ip> <frontend-url.top-level-domain>"
+>> add entry for backend "<cluster ip> <backend-url.top-level-domain>"
+>> :wq! (save changes)
 ```
-2. Done! The applications should be available at
-    - (frontend) `http://YOURIP:30000`
-    - (backend) `http://CLUSTERIP:30001/catena/swagger-ui/index.html`
+4. Done! The applications should be available at:
+    - (frontend) `http://your-frontend-host-address.com`
+    - (backend) `http://your-backend-host-address.com`
diff --git a/SECURITY.md b/SECURITY.md
@@ -1,6 +1,17 @@
 # Security Policy
-
 ## Reporting a Vulnerability
+Please do **not** report security vulnerabilities through public GitHub issues.
+
+Please report vulnerabilities to this repository via **GitHub security advisories** instead.
+
+How? Inside affected repository --> security tab
+
+for contributor:
+--> Report a vulnerability
+
+for committer:
+--> advisories --> New draft security advisory
+
+In severe cases, you can also report a found vulnerability via mail or eclipse issue here: https://www.eclipse.org/security/
 
-Please report a found vulnerability here:
-[https://www.eclipse.org/security/](https://www.eclipse.org/security/)
+See [Eclipse Foundation Vulnerability Reporting Policy](https://www.eclipse.org/projects/handbook/#vulnerability)
diff --git a/backend/SECURITY.md b/backend/SECURITY.md
@@ -1,6 +1,17 @@
 # Security Policy
-
 ## Reporting a Vulnerability
+Please do **not** report security vulnerabilities through public GitHub issues.
+
+Please report vulnerabilities to this repository via **GitHub security advisories** instead.
+
+How? Inside affected repository --> security tab
+
+for contributor:
+--> Report a vulnerability
+
+for committer:
+--> advisories --> New draft security advisory
+
+In severe cases, you can also report a found vulnerability via mail or eclipse issue here: https://www.eclipse.org/security/
 
-Please report a found vulnerability here:
-[https://www.eclipse.org/security/](https://www.eclipse.org/security/)
+See [Eclipse Foundation Vulnerability Reporting Policy](https://www.eclipse.org/projects/handbook/#vulnerability)
diff --git a/...in/java/org/eclipse/tractusx/puris/backend/common/api/logic/service/VariablesService.java b/...in/java/org/eclipse/tractusx/puris/backend/common/api/logic/service/VariablesService.java
@@ -86,6 +86,11 @@ public class VariablesService {
      * during asset creation.
      */
     private String responseApiAssetId;
+    @Value("${puris.api.key}")
+    /**
+     * The key for accessing the api.
+     */
+    private String apiKey;
 
     @Value("${edc.controlplane.key}")
     /**
@@ -114,43 +119,39 @@ public class VariablesService {
      * the name of your company.
      */
     private String ownName;
-    @Value("${own.default.bpns}")
+    @Value("${own.bpns}")
     /**
      * A BPNS that was assigned to you.
      */
     private String ownDefaultBpns;
-    @Value("${own.default.site.name}")
+    @Value("${own.site.name}")
     /**
      * A human-readable description of the site that you referenced in
      * the ownDefaultBpns.
      */
     private String ownDefaultSiteName;
-    @Value("${own.default.bpna}")
+    @Value("${own.bpna}")
     /** A BPNA that was assigned to you. If you initialised the
      * ownDefaultBpns variable, then it must be a BPNA that is associated
      * to that BPNS.
      */
     private String ownDefaultBpna;
-    @Value("${own.default.streetandnumber}")
+    @Value("${own.streetandnumber}")
     /**
      * The street and number associated to the ownDefaultBpna
      */
     private String ownDefaultStreetAndNumber;
-    @Value("${own.default.zipcodeandcity}")
+    @Value("${own.zipcodeandcity}")
     /**
      * The zip code and name of the city associated to the ownDefaultBpna
      */
     private String ownDefaultZipCodeAndCity;
-    @Value("${own.default.country}")
+    @Value("${own.country}")
     /**
      * The country in which your ownDefaultBpna-address is located.
      */
     private String ownDefaultCountry;
-    /**
-     * The key for accessing the api.
-     */
-    @Value("${puris.api.key}")
-    private String apiKey;
+
 
     /**
      * Returns the asset-id as defined in the properties file for the given api method

diff --git a/backend/src/main/java/org/eclipse/tractusx/puris/backend/common/security/SecurityConfig.java b/backend/src/main/java/org/eclipse/tractusx/puris/backend/common/security/SecurityConfig.java
@@ -69,7 +69,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 // any request in spring context
                 (authorizeHttpRequests) -> authorizeHttpRequests
                     .requestMatchers("/stockView/**", "/partners/**",  "/materials/**", "/materialpartnerrelations/**", "/product-stock/**", "/edrendpoint/**").authenticated()
-                    .requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll()
+                    .requestMatchers("/swagger-ui/**", "/v3/api-docs/**", "/health/**").permitAll()
             )
             .httpBasic(
                 AbstractHttpConfigurer::disable

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
@@ -23,6 +23,9 @@ edc.controlplane.key=${EDC_CONTROLPLANE_KEY:password}
 edc.controlplane.management.url=${EDC_CONTROLPLANE_MANAGEMENT_URL:http://customer-control-plane:8181/management}
 edc.controlplane.protocol.url=${EDC_CONTROLPLANE_PROTOCOL_URL:http://customer-control-plane:8184/api/v1/dsp}
 
+# Needs to be set for forwarding http --> https
+edc.web.rest.cors.enabled=true
+
 # Jackson (JSON)
 #spring.jackson.default-property-inclusion=non_empty
 #logging.level.org.hibernate.SQL=DEBUG
@@ -31,18 +34,21 @@ spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 
 # Own BPNL
 own.bpnl=${OWN_BPNL:BPNL4444444444XX}
+
 # Own name (self-description)
 own.name=${OWN_NAME:Scenario Customer}
-# Own BPNS (optional: if this is set, then set own.default.site.name as well)
-own.default.bpns=${OWN_DEFAULT_BPNS:BPNS4444444444XX}
+
+# Own BPNS (optional: if this is set, then set own.site.name as well)
+own.bpns=${OWN_BPNS:BPNS4444444444XY}
 # Name of Site (see above)
-own.default.site.name=${OWN_DEFAULT_SITE_NAME:Hauptwerk Musterhausen}
+own.site.name=${OWN_SITE:Hauptwerk Musterhausen}
+
 # If a BPNS is set, then this BPNA will be attached to it.
 # Otherwise, it will be attached immediately to the BPNL (see above)
-own.default.bpna=${OWN_DEFAULT_BPNA:BPNA4444444444ZZ}
-own.default.streetandnumber=${OWN_DEFAULT_STREETANDNUMBER:Musterstrasse 35b}
-own.default.zipcodeandcity=${OWN_DEFAULT_ZIPCODEANDCITY:77777 Musterhausen}
-own.default.country=${OWN_DEFAULT_COUNTRY:Germany}
+own.bpna=${OWN_BPNA:BPNA4444444444ZZ}
+own.streetandnumber=${OWN_STREETANDNUMBER:Musterstrasse 35b}
+own.zipcodeandcity=${OWN_ZIPCODEANDCITY:77777 Musterhausen}
+own.country=${OWN_COUNTRY:Germany}
 
 server.ssl.enabled=false
 #server.port=8443

diff --git a/backend/src/test/resources/application.properties b/backend/src/test/resources/application.properties
@@ -23,6 +23,9 @@ edc.controlplane.key=${EDC_CONTROLPLANE_KEY:password}
 edc.controlplane.management.url=${EDC_CONTROLPLANE_MANAGEMENT_URL:http://customer-control-plane:8181/management}
 edc.controlplane.protocol.url=${EDC_CONTROLPLANE_PROTOCOL_URL:http://customer-control-plane:8184/api/v1/dsp}
 
+# Needs to be set for forwarding http --> https
+edc.web.rest.cors.enabled=true
+
 # Jackson (JSON)
 #spring.jackson.default-property-inclusion=non_empty
 #logging.level.org.hibernate.SQL=DEBUG
@@ -31,18 +34,21 @@ spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 
 # Own BPNL
 own.bpnl=${OWN_BPNL:BPNL4444444444XX}
+
 # Own name (self-description)
 own.name=${OWN_NAME:Scenario Customer}
-# Own BPNS (optional: if this is set, then set own.default.site.name as well)
-own.default.bpns=${OWN_DEFAULT_BPNS:BPNS4444444444XX}
+
+# Own BPNS (optional: if this is set, then set own.site.name as well)
+own.bpns=${OWN_BPNS:BPNS4444444444XY}
 # Name of Site (see above)
-own.default.site.name=${OWN_DEFAULT_SITE_NAME:Hauptwerk Musterhausen}
+own.site.name=${OWN_SITE:Hauptwerk Musterhausen}
+
 # If a BPNS is set, then this BPNA will be attached to it.
 # Otherwise, it will be attached immediately to the BPNL (see above)
-own.default.bpna=${OWN_DEFAULT_BPNA:BPNA4444444444ZZ}
-own.default.streetandnumber=${OWN_DEFAULT_STREETANDNUMBER:Musterstrasse 35b}
-own.default.zipcodeandcity=${OWN_DEFAULT_ZIPCODEANDCITY:77777 Musterhausen}
-own.default.country=${OWN_DEFAULT_COUNTRY:Germany}
+own.bpna=${OWN_BPNA:BPNA4444444444ZZ}
+own.streetandnumber=${OWN_STREETANDNUMBER:Musterstrasse 35b}
+own.zipcodeandcity=${OWN_ZIPCODEANDCITY:77777 Musterhausen}
+own.country=${OWN_COUNTRY:Germany}
 
 # run with:
 # ./mvnw spring-boot:run -Dspring-boot.run.arguments=--spring.config.location="./src/main/resources/application.properties"