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

Use new production server

See merge request t3o/typo3.org!259

.gitlab-ci.yml

-include: 'https://git-t3o.typo3.org/t3o/t3olayout/raw/master/Configuration/GitLab/t3o-builds.yml'
+include:
+  - project: 't3o/t3olayout'
+    ref: master
+    file: '/Configuration/GitLab/t3o-builds.yml'
 
 variables:
   GIT_STRATEGY: "none"
   GIT_SSL_NO_VERIFY: "true"
   STAGE_PORT: 22200
   STAGE_HOST: "stage-v9.typo3.org"
-  PRODUCTION_PORT: 22193
-  PRODUCTION_HOST: "typo3.org"
+  PRODUCTION_PORT: 22201
+  PRODUCTION_HOST: "v9.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/php72/bin/php"

.gitlab-ci/deployer/deploy.php

@@ -2,8 +2,8 @@
 
 namespace Deployer;
 
-require_once '/composer/vendor/deployer/deployer/recipe/common.php';
-require_once '/composer/vendor/deployer/recipes/rsync.php';
+require_once '/tmp/vendor/deployer/deployer/recipe/common.php';
+require_once '/tmp/vendor/deployer/recipes/recipe/rsync.php';
 
 $sharedDirectories = [
     'private/fileadmin',
@@ -20,7 +20,7 @@ $sharedFiles = [
 set('shared_files', $sharedFiles);
 
 $writeableDirectories = [
-    'public/typo3temp',
+    'public/typo3temp'
 ];
 set('writable_dirs', $writeableDirectories);
 
@@ -46,13 +46,14 @@ set('rsync', [
     'filter' => [],
     'filter-file' => false,
     'filter-perdir' => false,
-    'flags' => 'avz',
+    'flags' => 'az',
     'options' => ['delete'],
     'timeout' => 300
 ]);
 set('rsync_src', './');
 set('keep_releases', 10);
-serverList('.gitlab-ci/deployer/servers.yml');
+inventory('./.gitlab-ci/deployer/servers.yml');
+set('php', '/opt/php/php72/bin/php');
 set('bin_folder', 'vendor/bin/');
 
 task('typo3', function () {
@@ -74,5 +75,5 @@ task('deploy', [
     'typo3',
     'deploy:symlink',
     'cache',
-    'cleanup',
+    'cleanup'
 ]);

.gitlab-ci/deployer/servers.yml

 master:
     stage: production
-    host: typo3.org
-    port: 22193
+    hostname: v9.typo3.org
+    port: 22201
     user: tthreeorg
+    writable_mode: chmod
     forward_agent: true
     deploy_path: ~/ci
-    php: /opt/php/php70/bin/php
 develop:
     stage: stage
+    hostname: stage-v9.typo3.org
     port: 22200
-    host: stage-v9.typo3.org
     user: tthreeorgstage
     writable_mode: chmod
     forward_agent: true
     deploy_path: ~/ci
-    php: /opt/php/php72/bin/php