Merge branch 'develop' into staging

* develop:
  add site configuration for rest api and add additional configuration to provide env vars
  remove trash

Dockerfile

@@ -3,15 +3,8 @@ ENV TZ=Europe/Berlin
 
 WORKDIR /var/www/html
 USER root
-#RUN usermod -a -G ssl-cert www-data
-#RUN chown -R root:ssl-cert /etc/ssl \
-#    && chmod -R 640 /etc/ssl/private \
-#    && chmod 640 /etc/ssl/private/apache-selfsigned.key
 COPY . .
-#RUN chown -R www-data:www-data /var/www
-#USER www-data
 ONBUILD COPY composer.json ./
 RUN composer install --no-interaction
 RUN chown -R nobody:nobody /var/www
-USER nobody
-
+USER nobody

config/sites/abi2021/config.yaml

@@ -15,3 +15,5 @@ languages:
     websiteTitle: ''
 rootPageId: 6
 websiteTitle: 'abi» dein weg in studium und beruf'
+imports:
+  - { resource: "EXT:nnrestapi/Configuration/Yaml/default.yaml" }

config/sites/restapi/config.yaml

@@ -0,0 +1,19 @@
+base: 'https://abitypo3cms.ddev.site/'
+languages:
+  -
+    title: English
+    enabled: true
+    base: 'https://abitypo3cms.ddev.site/'
+    typo3Language: default
+    locale: en_US.UTF-8
+    iso-639-1: en
+    websiteTitle: ''
+    navigationTitle: ''
+    hreflang: ''
+    direction: ''
+    flag: global
+    languageId: 0
+rootPageId: 13673
+websiteTitle: 'abi rest api'
+imports:
+  - { resource: "EXT:nnrestapi/Configuration/Yaml/default.yaml" }

public/typo3conf/AdditionalConfiguration.php

@@ -0,0 +1,11 @@
+<?php
+
+use Dotenv\Dotenv;
+
+$dotenv = Dotenv::createImmutable(__DIR__);
+$dotenv->safeLoad();
+
+class AdditionalConfiguration
+{
+
+}