Merge branch 'task/new-server' into 'develop'

Change to PHP 7.2 and deployment to new server

See merge request t3o/typo3.org!256

.ddev/config.yaml

-APIVersion: v1.5.0
+APIVersion: v1.5.1
 name: typo3.org
 type: typo3
-docroot: html
-php_version: "7.0"
+docroot: public
+php_version: "7.2"
 webserver_type: nginx-fpm
 router_http_port: "80"
 router_https_port: "443"
@@ -14,17 +14,16 @@ webcache_enabled: false
 provider: default
 hooks:
   post-start:
-  - exec: cp html/typo3conf/AdditionalConfiguration.ddev.php html/typo3conf/AdditionalConfiguration.php
-  - exec: composer install -d /var/www/html
-  - exec: npm --prefix html/typo3conf/ext/t3olayout/Build install
-  - exec: npm --prefix html/typo3conf/ext/t3olayout/Build run-script build
+  - exec: cp private/typo3conf/AdditionalConfiguration.ddev.php private/typo3conf/AdditionalConfiguration.php
+  - exec: composer install --ignore-platform-reqs -d /var/www/html
+  - exec: npm --prefix private/typo3conf/ext/t3olayout/Build install
+  - exec: npm --prefix private/typo3conf/ext/t3olayout/Build run-script build
   - exec: ./vendor/bin/typo3cms install:generatepackagestates
   - exec: ./vendor/bin/typo3cms install:extensionsetupifpossible
-  - exec: ./vendor/bin/typo3cms extension:activate redirects
 
 
-# This config.yaml was created with ddev version v1.5.0 
-# webimage: drud/ddev-webserver:v1.5.0
+# This config.yaml was created with ddev version v1.5.1 
+# webimage: drud/ddev-webserver:v1.5.1
 # dbimage: drud/ddev-dbserver:v1.5.0-10.2
 # dbaimage: drud/phpmyadmin:v1.5.0
 # bgsyncimage: drud/ddev-bgsync:v1.5.0

.gitignore

-bin
-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
+.idea
+/vendor
+/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.yml

-include: 'https://git-t3o.typo3.org/t3o/t3olayout/raw/develop/Configuration/GitLab/t3o-builds.yml'
+include: 'https://git-t3o.typo3.org/t3o/t3olayout/raw/master/Configuration/GitLab/t3o-builds.yml'
 
 variables:
   GIT_STRATEGY: "none"
   GIT_SSL_NO_VERIFY: "true"
-  STAGE_PORT: 22191
-  STAGE_HOST: "stage.typo3.org"
+  STAGE_PORT: 22200
+  STAGE_HOST: "stage-v9.typo3.org"
   PRODUCTION_PORT: 22193
   PRODUCTION_HOST: "typo3.org"
   DUMP_USER: "tthreeorgstage"
   DUMP_EXCLUDE_TABLES_LIST: "be_groups,be_sessions,be_users,cf_cache_hash,cf_cache_hash_tags,cf_cache_imagesizes,cf_cache_imagesizes_tags,cf_cache_news_category,cf_cache_news_category_tags,cf_cache_pages,cf_cache_pages_tags,cf_cache_pagesection,cf_cache_pagesection_tags,cf_cache_rootline,cf_cache_rootline_tags,cf_extbase_datamapfactory_datamap,cf_extbase_datamapfactory_datamap_tags,cf_extbase_object,cf_extbase_object_tags,cf_extbase_reflection,cf_extbase_reflection_tags,cf_tx_solr,cf_tx_solr_configuration,cf_tx_solr_configuration_tags,cf_tx_solr_tags,fe_groups,fe_sessions,fe_users,sys_domain,sys_log,tx_solr_cache,tx_solr_cache_tags"
-  PHP_EXECUTABLE: "/opt/php/php70/bin/php"
+  PHP_EXECUTABLE: "/opt/php/php72/bin/php"

.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'
+    'private/fileadmin',
+    'private/uploads',
+    'public/.well-known'
 ];
 set('shared_dirs', $sharedDirectories);
 
 $sharedFiles = [
-    'html/typo3conf/AdditionalConfiguration.php',
+    'private/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);
 
@@ -30,13 +28,15 @@ $exclude = [
     '.gitignore',
     '.htaccess',
     '.git',
+    '.ddev',
+    '.gitlab-ci.yml',
+    'auth.json',
     'Readme.rst',
     'Readme.txt',
     'Upgrading.rst',
     'Upgrading.txt',
     'README',
     '*.example',
-    'AdditionalConfiguration.sample.php'
 ];
 set('rsync', [
     'exclude' => array_merge($sharedDirectories, $sharedFiles, $exclude),
@@ -53,19 +53,15 @@ set('rsync', [
 set('rsync_src', './');
 set('keep_releases', 10);
 serverList('.gitlab-ci/deployer/servers.yml');
-set('php', '/opt/php/php70/bin/php');
-set('typo3_console', 'vendor/bin/typo3cms');
+set('bin_folder', 'vendor/bin/');
 
 task('typo3', function () {
-    run('cd {{release_path}} && {{php}} {{typo3_console}} install:generatepackagestates');
-    run('cd {{release_path}} && {{php}} {{typo3_console}} install:extensionsetupifpossible');
-    // temporary activation of redirects module until upgrade to v9
-    run('cd {{release_path}} && {{php}} composer.phar install');
-    run('cd {{release_path}} && {{php}} {{typo3_console}} extension:activate redirects');
+    run('cd {{release_path}} && {{php}} {{bin_folder}}typo3cms install:generatepackagestates');
+    run('cd {{release_path}} && {{php}} {{bin_folder}}typo3cms install:extensionsetupifpossible');
 });
 
 task('cache', function () {
-    run('cd {{release_path}} && {{php}} vendor/bin/cachetool opcache:reset');
+    run('cd {{release_path}} && {{php}} {{bin_folder}}cachetool opcache:reset');
 });
 
 task('deploy', [

.gitlab-ci/deployer/servers.yml

@@ -5,10 +5,13 @@ master:
     user: tthreeorg
     forward_agent: true
     deploy_path: ~/ci
+    php: /opt/php/php70/bin/php
 develop:
     stage: stage
-    host: stage.typo3.org
-    port: 22191
+    port: 22200
+    host: stage-v9.typo3.org
     user: tthreeorgstage
+    writable_mode: chmod
     forward_agent: true
     deploy_path: ~/ci
+    php: /opt/php/php72/bin/php

scripts @ 57323530

-Subproject commit 57323530b0771c5575efb38d64d1bf117716ebf5

.gitmodules

-[submodule ".gitlab-ci"]
-	path = .gitlab-ci/scripts
-	url = https://github.com/torvitas/docker-scripts.git
-[submodule ".gitlab-ci/scripts"]
-	path = .gitlab-ci/scripts
-	url = https://github.com/torvitas/docker-scripts.git

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,24 +63,22 @@
     "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": {
-      "php": "7.0.30"
+      "php": "7.2.13"
     }
   },
   "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"
-    }
   }
 }