Merge branch 'develop' into staging

* develop:
  return to apache
  revert to alpine base image and add crazytermsapi extension

composer.json

@@ -33,6 +33,19 @@
 				}
 			}
 		},
+		{
+			"type": "git",
+			"url": "https://git2.meramo.org/typo3-Extensions/crazytermsapi.git",
+			"options": {
+				"ssl": {
+					"verify_peer": true,
+					"verify_peer_name": true
+				},
+				"http": {
+					"header": "Authorization: Bearer 4164b811b0774eaa8a34938e39458bcd66309e57"
+				}
+			}
+		},
 		{
 			"type": "git",
 			"url": "https://git2.meramo.org/typo3-Extensions/mrm_be.git",
@@ -67,9 +80,11 @@
 		"helhum/typo3-console": "^6.0.0",
 		"ichhabrecht/content-defender": "^3.2",
 		"meramo/begriffmgt": "@dev",
+		"meramo/crazytermsapi": "@dev",
 		"meramo/mrm-be": "@dev",
 		"meramo/mrmbepages": "@dev",
 		"mongodb/mongodb": "^1.10",
+		"nng/nnrestapi": "^1.4",
 		"typo3/cms-about": "^10.4.0",
 		"typo3/cms-backend": "^10.4.0",
 		"typo3/cms-belog": "^10.4.0",

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" }