Merge branch 'develop'

This commit is contained in:
Björn Fromme
2022-10-04 17:16:43 +02:00
5 changed files with 92 additions and 292 deletions
-1
View File
@@ -22,7 +22,6 @@ nfs_mount_enabled: false
mutagen_enabled: false
hooks:
post-start:
- exec: sudo chmod 600 /home/fromme/.ssh/authorized_keys
- exec: sudo service ssh start
omit_containers: [dba]
webimage_extra_packages: [ssh]
+1 -2
View File
@@ -77,8 +77,7 @@
}
},
"require-dev": {
"deployer/deployer": "^6.8",
"deployer/recipes": "^6.2",
"deployer/deployer": "^7",
"ichhabrecht/filefill": "^3.3",
"typo3/testing-framework": "^6.16"
},
Generated
+75 -268
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "710142baed2d9361b6cb21b4424da20b",
"content-hash": "2ef2df59ab7af408bda8770f685e1b8b",
"packages": [
{
"name": "b13/container",
@@ -2704,16 +2704,16 @@
},
{
"name": "symfony/asset",
"version": "v5.4.7",
"version": "v5.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/asset.git",
"reference": "4affdca3da5f380caa27a338269b36ac288b3981"
"reference": "9aa867206711cb6fcca51ef127ba52a018170be9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/asset/zipball/4affdca3da5f380caa27a338269b36ac288b3981",
"reference": "4affdca3da5f380caa27a338269b36ac288b3981",
"url": "https://api.github.com/repos/symfony/asset/zipball/9aa867206711cb6fcca51ef127ba52a018170be9",
"reference": "9aa867206711cb6fcca51ef127ba52a018170be9",
"shasum": ""
},
"require": {
@@ -2758,7 +2758,7 @@
"description": "Manages URL generation and versioning of web assets such as CSS stylesheets, JavaScript files and image files",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/asset/tree/v5.4.7"
"source": "https://github.com/symfony/asset/tree/v5.4.13"
},
"funding": [
{
@@ -2774,20 +2774,20 @@
"type": "tidelift"
}
],
"time": "2022-03-18T16:00:30+00:00"
"time": "2022-08-31T08:17:19+00:00"
},
{
"name": "symfony/cache",
"version": "v5.4.11",
"version": "v5.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
"reference": "5a0fff46df349f0db3fe242263451fddf5277362"
"reference": "89bb6a0fe27205636d80e568ffaf9bbb52f691e3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/cache/zipball/5a0fff46df349f0db3fe242263451fddf5277362",
"reference": "5a0fff46df349f0db3fe242263451fddf5277362",
"url": "https://api.github.com/repos/symfony/cache/zipball/89bb6a0fe27205636d80e568ffaf9bbb52f691e3",
"reference": "89bb6a0fe27205636d80e568ffaf9bbb52f691e3",
"shasum": ""
},
"require": {
@@ -2848,14 +2848,14 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Provides an extended PSR-6, PSR-16 (and tags) implementation",
"description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
"homepage": "https://symfony.com",
"keywords": [
"caching",
"psr6"
],
"support": {
"source": "https://github.com/symfony/cache/tree/v5.4.11"
"source": "https://github.com/symfony/cache/tree/v5.4.13"
},
"funding": [
{
@@ -2871,7 +2871,7 @@
"type": "tidelift"
}
],
"time": "2022-07-28T15:25:17+00:00"
"time": "2022-09-06T13:23:31+00:00"
},
{
"name": "symfony/cache-contracts",
@@ -3033,16 +3033,16 @@
},
{
"name": "symfony/console",
"version": "v5.4.12",
"version": "v5.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1"
"reference": "3f97f6c7b7e26848a90c0c0cfb91eeb2bb8618be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1",
"reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1",
"url": "https://api.github.com/repos/symfony/console/zipball/3f97f6c7b7e26848a90c0c0cfb91eeb2bb8618be",
"reference": "3f97f6c7b7e26848a90c0c0cfb91eeb2bb8618be",
"shasum": ""
},
"require": {
@@ -3112,7 +3112,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v5.4.12"
"source": "https://github.com/symfony/console/tree/v5.4.13"
},
"funding": [
{
@@ -3128,20 +3128,20 @@
"type": "tidelift"
}
],
"time": "2022-08-17T13:18:05+00:00"
"time": "2022-08-26T13:50:20+00:00"
},
{
"name": "symfony/dependency-injection",
"version": "v5.4.11",
"version": "v5.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "a8b9251016e9476db73e25fa836904bc0bf74c62"
"reference": "24cf522668845391c0542bc1de496366072a6d0e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a8b9251016e9476db73e25fa836904bc0bf74c62",
"reference": "a8b9251016e9476db73e25fa836904bc0bf74c62",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/24cf522668845391c0542bc1de496366072a6d0e",
"reference": "24cf522668845391c0542bc1de496366072a6d0e",
"shasum": ""
},
"require": {
@@ -3201,7 +3201,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/dependency-injection/tree/v5.4.11"
"source": "https://github.com/symfony/dependency-injection/tree/v5.4.13"
},
"funding": [
{
@@ -3217,7 +3217,7 @@
"type": "tidelift"
}
],
"time": "2022-07-20T13:00:38+00:00"
"time": "2022-08-30T19:10:13+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -3515,16 +3515,16 @@
},
{
"name": "symfony/filesystem",
"version": "v5.4.12",
"version": "v5.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447"
"reference": "ac09569844a9109a5966b9438fc29113ce77cf51"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/2d67c1f9a1937406a9be3171b4b22250c0a11447",
"reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/ac09569844a9109a5966b9438fc29113ce77cf51",
"reference": "ac09569844a9109a5966b9438fc29113ce77cf51",
"shasum": ""
},
"require": {
@@ -3559,7 +3559,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v5.4.12"
"source": "https://github.com/symfony/filesystem/tree/v5.4.13"
},
"funding": [
{
@@ -3575,7 +3575,7 @@
"type": "tidelift"
}
],
"time": "2022-08-02T13:48:16+00:00"
"time": "2022-09-21T19:53:16+00:00"
},
{
"name": "symfony/finder",
@@ -3642,16 +3642,16 @@
},
{
"name": "symfony/http-client",
"version": "v4.4.45",
"version": "v4.4.46",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
"reference": "9f9dd96f2ab29eec1a56ad7593c594075e5b368d"
"reference": "095274039721d26d23225d7b7ba441423b1b2413"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-client/zipball/9f9dd96f2ab29eec1a56ad7593c594075e5b368d",
"reference": "9f9dd96f2ab29eec1a56ad7593c594075e5b368d",
"url": "https://api.github.com/repos/symfony/http-client/zipball/095274039721d26d23225d7b7ba441423b1b2413",
"reference": "095274039721d26d23225d7b7ba441423b1b2413",
"shasum": ""
},
"require": {
@@ -3703,7 +3703,7 @@
"description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-client/tree/v4.4.45"
"source": "https://github.com/symfony/http-client/tree/v4.4.46"
},
"funding": [
{
@@ -3719,7 +3719,7 @@
"type": "tidelift"
}
],
"time": "2022-08-02T07:15:06+00:00"
"time": "2022-09-04T17:31:03+00:00"
},
{
"name": "symfony/http-client-contracts",
@@ -3801,16 +3801,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v5.4.12",
"version": "v5.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "f4bfe9611b113b15d98a43da68ec9b5a00d56791"
"reference": "54be067587a4f2b7fffb7a699f9481ec3daf9379"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/f4bfe9611b113b15d98a43da68ec9b5a00d56791",
"reference": "f4bfe9611b113b15d98a43da68ec9b5a00d56791",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/54be067587a4f2b7fffb7a699f9481ec3daf9379",
"reference": "54be067587a4f2b7fffb7a699f9481ec3daf9379",
"shasum": ""
},
"require": {
@@ -3857,7 +3857,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-foundation/tree/v5.4.12"
"source": "https://github.com/symfony/http-foundation/tree/v5.4.13"
},
"funding": [
{
@@ -3873,7 +3873,7 @@
"type": "tidelift"
}
],
"time": "2022-08-19T07:33:17+00:00"
"time": "2022-09-17T07:31:22+00:00"
},
{
"name": "symfony/inflector",
@@ -3950,16 +3950,16 @@
},
{
"name": "symfony/mailer",
"version": "v5.4.12",
"version": "v5.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/mailer.git",
"reference": "076043af11e58b20a68d2fd93f59cdbc6e8fdd00"
"reference": "63bf36a5150ac0bfed1c4d0a4e0b114a57b77e11"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mailer/zipball/076043af11e58b20a68d2fd93f59cdbc6e8fdd00",
"reference": "076043af11e58b20a68d2fd93f59cdbc6e8fdd00",
"url": "https://api.github.com/repos/symfony/mailer/zipball/63bf36a5150ac0bfed1c4d0a4e0b114a57b77e11",
"reference": "63bf36a5150ac0bfed1c4d0a4e0b114a57b77e11",
"shasum": ""
},
"require": {
@@ -4006,7 +4006,7 @@
"description": "Helps sending emails",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/mailer/tree/v5.4.12"
"source": "https://github.com/symfony/mailer/tree/v5.4.13"
},
"funding": [
{
@@ -4022,20 +4022,20 @@
"type": "tidelift"
}
],
"time": "2022-08-03T05:17:26+00:00"
"time": "2022-08-29T06:47:07+00:00"
},
{
"name": "symfony/mime",
"version": "v5.4.12",
"version": "v5.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "03876e9c5a36f5b45e7d9a381edda5421eff8a90"
"reference": "bb2ccf759e2b967dcd11bdee5bdf30dddd2290bd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/03876e9c5a36f5b45e7d9a381edda5421eff8a90",
"reference": "03876e9c5a36f5b45e7d9a381edda5421eff8a90",
"url": "https://api.github.com/repos/symfony/mime/zipball/bb2ccf759e2b967dcd11bdee5bdf30dddd2290bd",
"reference": "bb2ccf759e2b967dcd11bdee5bdf30dddd2290bd",
"shasum": ""
},
"require": {
@@ -4089,7 +4089,7 @@
"mime-type"
],
"support": {
"source": "https://github.com/symfony/mime/tree/v5.4.12"
"source": "https://github.com/symfony/mime/tree/v5.4.13"
},
"funding": [
{
@@ -4105,7 +4105,7 @@
"type": "tidelift"
}
],
"time": "2022-08-19T14:24:03+00:00"
"time": "2022-09-01T18:18:29+00:00"
},
{
"name": "symfony/options-resolver",
@@ -5497,16 +5497,16 @@
},
{
"name": "symfony/string",
"version": "v5.4.12",
"version": "v5.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "2fc515e512d721bf31ea76bd02fe23ada4640058"
"reference": "2900c668a32138a34118740de3e4d5a701801f53"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058",
"reference": "2fc515e512d721bf31ea76bd02fe23ada4640058",
"url": "https://api.github.com/repos/symfony/string/zipball/2900c668a32138a34118740de3e4d5a701801f53",
"reference": "2900c668a32138a34118740de3e4d5a701801f53",
"shasum": ""
},
"require": {
@@ -5563,7 +5563,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v5.4.12"
"source": "https://github.com/symfony/string/tree/v5.4.13"
},
"funding": [
{
@@ -5579,20 +5579,20 @@
"type": "tidelift"
}
],
"time": "2022-08-12T17:03:11+00:00"
"time": "2022-09-01T01:52:16+00:00"
},
{
"name": "symfony/var-dumper",
"version": "v5.4.11",
"version": "v5.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "b8f306d7b8ef34fb3db3305be97ba8e088fb4861"
"reference": "2bf2ccab581bec363191672f0df40e0c85569e1c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/b8f306d7b8ef34fb3db3305be97ba8e088fb4861",
"reference": "b8f306d7b8ef34fb3db3305be97ba8e088fb4861",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/2bf2ccab581bec363191672f0df40e0c85569e1c",
"reference": "2bf2ccab581bec363191672f0df40e0c85569e1c",
"shasum": ""
},
"require": {
@@ -5652,7 +5652,7 @@
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v5.4.11"
"source": "https://github.com/symfony/var-dumper/tree/v5.4.13"
},
"funding": [
{
@@ -5668,7 +5668,7 @@
"type": "tidelift"
}
],
"time": "2022-07-20T13:00:38+00:00"
"time": "2022-09-06T13:23:31+00:00"
},
{
"name": "symfony/var-exporter",
@@ -8323,42 +8323,22 @@
"packages-dev": [
{
"name": "deployer/deployer",
"version": "v6.9.0",
"version": "v7.0.2",
"source": {
"type": "git",
"url": "https://github.com/deployphp/deployer.git",
"reference": "c4380effdc9f6d9c6ae549bb76f0a22bcb1d31d2"
"reference": "99a57a9035cfe0eeae5dba5befe5411ac0f3ac72"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/deployphp/deployer/zipball/c4380effdc9f6d9c6ae549bb76f0a22bcb1d31d2",
"reference": "c4380effdc9f6d9c6ae549bb76f0a22bcb1d31d2",
"url": "https://api.github.com/repos/deployphp/deployer/zipball/99a57a9035cfe0eeae5dba5befe5411ac0f3ac72",
"reference": "99a57a9035cfe0eeae5dba5befe5411ac0f3ac72",
"shasum": ""
},
"require": {
"deployer/phar-update": "~2.2",
"php": "^7.2 || ^8.0",
"pimple/pimple": "~3.0",
"symfony/console": "~2.7|~3.0|~4.0|~5.0",
"symfony/process": "~2.7|~3.0|~4.0|~5.0",
"symfony/yaml": "~2.7|~3.0|~4.0|~5.0"
},
"require-dev": {
"phpunit/phpunit": "^8"
},
"bin": [
"bin/dep"
"dep"
],
"type": "library",
"autoload": {
"files": [
"src/Support/helpers.php",
"src/functions.php"
],
"psr-4": {
"Deployer\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
@@ -8378,131 +8358,11 @@
},
"funding": [
{
"url": "https://github.com/antonmedv",
"url": "https://github.com/sponsors/antonmedv",
"type": "github"
}
],
"time": "2022-08-03T18:09:01+00:00"
},
{
"name": "deployer/phar-update",
"version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/deployphp/phar-update.git",
"reference": "9ad07422f2cd43a1382ee8e134bdcd3a374848e3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/deployphp/phar-update/zipball/9ad07422f2cd43a1382ee8e134bdcd3a374848e3",
"reference": "9ad07422f2cd43a1382ee8e134bdcd3a374848e3",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"symfony/console": "~2.7|~3.0|~4.0|~5.0"
},
"require-dev": {
"mikey179/vfsstream": "1.1.0",
"phpunit/phpunit": "3.7.*",
"symfony/process": "~2.7|~3.0|~4.0|~5.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Deployer\\Component\\PharUpdate\\": "src/",
"Deployer\\Component\\PHPUnit\\": "src/PHPUnit/",
"Deployer\\Component\\Version\\": "src/Version/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Kevin Herrera",
"email": "[email protected]",
"homepage": "http://kevin.herrera.io"
},
{
"name": "Anton Medvedev",
"email": "[email protected]",
"homepage": "https://medv.io"
}
],
"description": "Integrates Phar Update to Symfony Console.",
"homepage": "https://github.com/deployphp/phar-update",
"keywords": [
"console",
"phar",
"update"
],
"support": {
"issues": "https://github.com/deployphp/phar-update/issues",
"source": "https://github.com/deployphp/phar-update/tree/v2.2.0"
},
"abandoned": true,
"time": "2019-12-12T13:45:57+00:00"
},
{
"name": "deployer/recipes",
"version": "6.2.2",
"source": {
"type": "git",
"url": "https://github.com/deployphp/recipes.git",
"reference": "84b3229c518c094a950e1fe785b7b8f9598770fe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/deployphp/recipes/zipball/84b3229c518c094a950e1fe785b7b8f9598770fe",
"reference": "84b3229c518c094a950e1fe785b7b8f9598770fe",
"shasum": ""
},
"require": {
"php": "~7.0"
},
"require-dev": {
"deployer/deployer": "^6.3"
},
"type": "library",
"autoload": {
"files": [
"autoload.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Anton Medvedev",
"email": "[email protected]"
}
],
"description": "3rd party deployer recipes",
"homepage": "https://github.com/deployphp/recipes",
"keywords": [
"cachetool",
"cloudflare",
"deploy",
"deployer",
"deployment",
"hipchat",
"newrelic",
"rabbit",
"recipes",
"sentry",
"slack",
"yarn"
],
"support": {
"issues": "https://github.com/deployphp/recipes/issues",
"source": "https://github.com/deployphp/recipes"
},
"abandoned": true,
"time": "2019-06-27T06:47:18+00:00"
"time": "2022-09-10T07:44:30+00:00"
},
{
"name": "ichhabrecht/filefill",
@@ -9212,59 +9072,6 @@
],
"time": "2022-09-25T03:44:45+00:00"
},
{
"name": "pimple/pimple",
"version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/silexphp/Pimple.git",
"reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
"reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"psr/container": "^1.1 || ^2.0"
},
"require-dev": {
"symfony/phpunit-bridge": "^5.4@dev"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4.x-dev"
}
},
"autoload": {
"psr-0": {
"Pimple": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "[email protected]"
}
],
"description": "Pimple, a simple Dependency Injection Container",
"homepage": "https://pimple.symfony.com",
"keywords": [
"container",
"dependency injection"
],
"support": {
"source": "https://github.com/silexphp/Pimple/tree/v3.5.0"
},
"time": "2021-10-28T11:13:42+00:00"
},
{
"name": "sebastian/cli-parser",
"version": "1.0.1",
+15 -20
View File
@@ -1,9 +1,9 @@
<?php
namespace Deployer;
require 'vendor/deployer/deployer/recipe/typo3.php';
require 'vendor/deployer/recipes/recipe/rsync.php';
require 'vendor/deployer/recipes/recipe/cachetool.php';
require 'recipe/typo3.php';
require 'contrib/rsync.php';
require 'contrib/cachetool.php';
set('typo3_webroot', 'public');
set('application', 'ep-reisen-typo3');
@@ -12,8 +12,6 @@ set('repository', '[email protected]:dreipunktnull/ep-reisen');
set('git_tty', false);
set('ssh_type', 'native');
set('allow_anonymous_stats', false);
add('shared_files', [
'{{typo3_webroot}}/typo3conf/LocalConfiguration.php',
'{{typo3_webroot}}/sinkhole.html',
@@ -58,19 +56,18 @@ $rsyncOptions = [
];
host('production')
->hostname('185.237.67.190')
->stage('production')
->user('p546128')
->forwardAgent()
->multiplexing()
->set('deploy_path', '/home/www/p546128/html/{{application}}')
->setHostname('185.237.67.190')
->setRemoteUser('p546128')
->setForwardAgent(true)
->setSshMultiplexing(true)
->setDeployPath('/home/www/p546128/html/{{application}}')
->set('buspronet_path', '/home/www/p546128/html/kuschick/buspronet/buspronet')
->set('bin/php', '/usr/local/bin/php')
->set('http_user', 'p546128')
->set('bin/composer', '/usr/local/bin/composer')
->set('composer_options', '--prefer-dist --no-progress --no-interaction --optimize-autoloader')
->set('rsync_src', __DIR__)
->set('rsync', $rsyncOptions)
->set('bin/cachetool', 'cachetool-7.0.0.phar')
->set('cachetool_args', '--web=SymfonyHttpClient --web-path={{release_path}}/public/ --web-url=https://www.ep-reisen.de')
;
@@ -78,19 +75,18 @@ $sharedFilesStaging = get('shared_files');
$sharedFilesStaging[] = '{{typo3_webroot}}/.htpasswd';
host('staging')
->hostname('185.237.67.190')
->stage('staging')
->user('p546128')
->forwardAgent()
->multiplexing()
->set('deploy_path', '/home/www/p546128/html/{{application}}-staging')
->setHostname('185.237.67.190')
->setRemoteUser('p546128')
->setForwardAgent(true)
->setSshMultiplexing(true)
->setDeployPath('/home/www/p546128/html/{{application}}-staging')
->set('buspronet_path', '/home/www/p546128/html/kuschick/buspronet/buspronet')
->set('bin/php', '/usr/local/bin/php')
->set('http_user', 'p546128')
->set('bin/composer', '/usr/local/bin/composer')
->set('composer_options', '--prefer-dist --no-progress --no-interaction --optimize-autoloader')
->set('rsync_src', __DIR__)
->set('rsync', $rsyncOptions)
->set('bin/cachetool', 'cachetool-7.0.0.phar')
->set('cachetool_args', '--web=SymfonyHttpClient --web-path={{release_path}}/public/ --web-url=https://staging.ep-reisen.de --web-basic-auth=ep:reisen')
->set('shared_files', $sharedFilesStaging)
;
@@ -110,7 +106,6 @@ task('deploy', [
'deploy:buspronet:symlink',
'deploy:unlock',
'cachetool:clear:opcache',
'cleanup',
]);
task('deploy:buspronet:symlink', function () {
@@ -20,7 +20,7 @@ export default class extends Controller {
if (this.hasLatValue && this.hasLngValue) {
const position = L.latLng(this.latValue, this.lngValue)
const marker = L.marker(position)
if (this.hasExternalLinkValue) {
if (this.hasExternalLinkValue && '' !== this.externalLinkValue) {
marker.on('click', () => {
window.open(this.externalLinkValue, '_blank')
})