Use typo3-secure-web and change docroot folders

.gitignore

-bin
+.idea
 vendor
-typo3_src
-html/index.php
-html/typo3
-html/fileadmin/
-html/typo3conf/ext/*
-!html/typo3conf/ext/t3org_layout/
-!html/typo3conf/ext/t3o_donation/
-html/typo3conf/AdditionalConfiguration.php
-html/typo3conf/deprecation_*
-html/typo3conf/ENABLE_INSTALL_TOOL
-html/typo3conf/PackageStates.php
-html/typo3conf/l10n
-html/typo3temp/
-html/uploads/
-html/services/api-keys.php
+private
+!private/typo3conf/LocalConfiguration.php
+!private/typo3conf/AdditionalConfiguration.ddev.php
+!private/typo3conf/RealurlConfiguration.php
+public
+public/services/api-keys.php
+!public/humans.txt
+!public/robots.txt
+!public/services
 /auth.json
 /assets/
 sequelpro.spf

.gitlab-ci/deployer/deploy.php

@@ -6,23 +6,21 @@ require_once '/composer/vendor/deployer/deployer/recipe/common.php';
 require_once '/composer/vendor/deployer/recipes/rsync.php';
 
 $sharedDirectories = [
-    'html/fileadmin',
-    'html/uploads',
-    'html/.well-known'
+    'public/fileadmin',
+    'public/uploads',
+    'public/.well-known'
 ];
 set('shared_dirs', $sharedDirectories);
 
 $sharedFiles = [
-    'html/typo3conf/AdditionalConfiguration.php',
+    'public/typo3conf/AdditionalConfiguration.php',
     '.cachetool.yml',
-    'html/services/api-keys.php'
+    'public/services/api-keys.php'
 ];
 set('shared_files', $sharedFiles);
 
 $writeableDirectories = [
-    'html/typo3temp',
-    'html/fileadmin',
-    'html/uploads'
+    'public/typo3temp',
 ];
 set('writable_dirs', $writeableDirectories);
 

composer.json

@@ -12,6 +12,10 @@
     "issues": "https://git-t3o.typo3.org/t3o/typo3.org/issues"
   },
   "repositories": [
+    {
+      "type": "path",
+      "url": "extensions/*"
+    },
     {
       "type": "vcs",
       "url": "https://git-t3o.typo3.org/t3o/t3olayout.git"
@@ -42,7 +46,6 @@
     }
   ],
   "require": {
-    "typo3/cms-core": "^8.7",
     "typo3/cms-linkvalidator": "*",
     "helhum/typo3-console": "^5.0",
     "dmitryd/typo3-realurl": "2.3.0",
@@ -60,7 +63,10 @@
     "cweagans/composer-patches": "^1.6",
     "mabahe/typo3-core-redirects": "^8.7",
     "typo3/cms-sys-note": "*",
-    "t3g/hubspot-forms": "1.0.0"
+    "t3g/hubspot-forms": "1.0.0",
+    "helhum/typo3-secure-web": "^0.2.8",
+    "t3o/t3org_layout": "@dev",
+    "t3o/t3o_donation": "@dev"
   },
   "config": {
     "platform": {
@@ -69,15 +75,10 @@
   },
   "extra": {
     "typo3/cms": {
-      "web-dir": "html",
+      "root-dir": "private",
+      "web-dir": "public",
       "cms-package-dir": "{$vendor-dir}/typo3/cms"
     },
     "enable-patching": true
-  },
-  "autoload": {
-    "psr-4": {
-      "T3o\\T3orgLayout\\": "html/typo3conf/ext/t3org_layout/Classes",
-      "T3o\\T3oDonation\\": "html/typo3conf/ext/t3o_donation/Classes"
-    }
   }
 }

html/typo3conf/ext/t3o_donation/composer.json → extensions/t3o_donation/composer.json

@@ -4,9 +4,6 @@
     "type": "typo3-cms-extension",
     "license": ["GPL-3.0+"],
     "keywords": ["TYPO3 CMS", "Donation"],
-    "require": {
-        "typo3/cms-core": "8.5.0 - 8.9.99"
-    },
     "autoload": {
         "psr-4": {
             "T3o\\T3oDonation\\": "Classes/"