From 915bad76a8d7f1e2f006b5f5a1bccd20e97b63a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20R?= Date: Sun, 25 Nov 2018 20:33:52 +0100 Subject: [PATCH 1/7] [Composer] Move roave/security-advisories to dev as adviced by package itself and by phpstorm --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d47a488d..340d96b5 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,6 @@ "ezsystems/repository-forms": "~1.5.5@dev", "hautelook/templated-uri-bundle": "^1.0 | ^2.1", "incenteev/composer-parameter-handler": "2.1.3", - "roave/security-advisories": "dev-master", "sensio/distribution-bundle": "^3.0.36 | ^4.0.40 | ^5.0.22", "sensio/framework-extra-bundle": "^3.0.29", "sensio/generator-bundle": "^2.5.3", @@ -50,7 +49,8 @@ "behat/symfony2-extension": "^2.1.5", "bex/behat-screenshot": "^1.2.7", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.0.0", - "ezsystems/behatbundle": "^6.5.4" + "ezsystems/behatbundle": "^6.5.4", + "roave/security-advisories": "dev-master" }, "scripts": { "post-install-cmd": [ From c81b3e01a76298d0e1538a0065e300c19bc127c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20R?= Date: Sun, 25 Nov 2018 20:52:17 +0100 Subject: [PATCH 2/7] [Composer] Fix missing ^ on incenteev/composer-parameter-handler --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 340d96b5..84b36e49 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "ezsystems/platform-ui-bundle": "~1.7.8@dev", "ezsystems/repository-forms": "~1.5.5@dev", "hautelook/templated-uri-bundle": "^1.0 | ^2.1", - "incenteev/composer-parameter-handler": "2.1.3", + "incenteev/composer-parameter-handler": "^2.1.3", "sensio/distribution-bundle": "^3.0.36 | ^4.0.40 | ^5.0.22", "sensio/framework-extra-bundle": "^3.0.29", "sensio/generator-bundle": "^2.5.3", From 04345cefdae5d366531352273d3005bd114ea055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20R?= Date: Sun, 25 Nov 2018 21:01:53 +0100 Subject: [PATCH 3/7] [Composer] Update matching rules for solr and stash --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 84b36e49..9d704ccf 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "egulias/listeners-debug-command-bundle": "^1.9.1", "ezsystems/content-on-the-fly-prototype": "~0.1.12@dev", "ezsystems/ez-support-tools": "~0.2.1@dev", - "ezsystems/ezplatform-solr-search-engine": "^1.5@dev", + "ezsystems/ezplatform-solr-search-engine": "^1.5.4@dev", "ezsystems/ezpublish-kernel": "~6.7.7@dev", "ezsystems/platform-ui-bundle": "~1.7.8@dev", "ezsystems/repository-forms": "~1.5.5@dev", @@ -36,7 +36,7 @@ "symfony/monolog-bundle": "^2.12.1", "symfony/swiftmailer-bundle": "^2.6.7", "symfony/symfony": "~2.8.47", - "tedivm/stash-bundle": "0.6.2", + "tedivm/stash-bundle": "^0.6.2", "twig/extensions": "^1.5.3", "white-october/pagerfanta-bundle": "~1.0.8", "willdurand/js-translation-bundle": "^2.6" From dde7af275de57f584215f51dbf8d34a9c7bc0400 Mon Sep 17 00:00:00 2001 From: Vidar Date: Thu, 29 Nov 2018 15:09:25 +0100 Subject: [PATCH 4/7] Fixed bug in solr template for Platform.sh (#335) * Fixed bug in solr template for Platform.sh * Added comment about solr multi core setup on Platform.sh --- .platform.app.yaml | 2 +- .platform/services.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.platform.app.yaml b/.platform.app.yaml index e974969a..b6051fe6 100644 --- a/.platform.app.yaml +++ b/.platform.app.yaml @@ -26,7 +26,7 @@ relationships: # this relationship and the corresponding service in .platform/services.yaml #redissession: 'redissession:redis' # If you wish to use solr, uncomment this relationship and the corresponding service in .platform/services.yaml - #solr: 'solrsearch:solr' + #solr: 'solrsearch:collection1' variables: #php: diff --git a/.platform/services.yaml b/.platform/services.yaml index 616be0e1..3841f108 100644 --- a/.platform/services.yaml +++ b/.platform/services.yaml @@ -35,6 +35,8 @@ rediscache: # If you wish to use solr, uncomment this service and the corresponding relationship in .platform.app.yaml. # Also, you need to generate the config using: # vendor/ezsystems/ezplatform-solr-search-engine/bin/generate-solr-config.sh +# Multi core setup is currently not supported on Platform.sh. Sharding does not work as the cores are +# unable to reach each other #solrsearch: # type: solr:6.6 # disk: 512 From 2166657b205db171910273810932aae36cee11ab Mon Sep 17 00:00:00 2001 From: Travis Raup Date: Fri, 30 Nov 2018 02:19:21 -0500 Subject: [PATCH 5/7] Set solr_core variable from platform.sh relationships (#334) * Set solr_core variable from platform.sh relationships This fixes a bug for ezplatform platform.sh customers with enterprise subscriptions. Platform.sh creates solr_cores named after the environment and not from the platform.sh services.yml file. You need to set the solr_core variable dynamically from the solr relationship using the path entry. * Update platformsh.php --- app/config/env/platformsh.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/config/env/platformsh.php b/app/config/env/platformsh.php index 86b831f0..34313623 100644 --- a/app/config/env/platformsh.php +++ b/app/config/env/platformsh.php @@ -128,5 +128,7 @@ $container->setParameter('search_engine', 'solr'); $container->setParameter('solr_dsn', sprintf('http://%s:%d/%s', $endpoint['host'], $endpoint['port'], 'solr')); + // To set solr_core parameter we assume path is in form like: "solr/collection1" + $container->setParameter('solr_core', substr($endpoint['path'], 5)); } } From 0cb060685ba16c4a9af4e3c22a0ae45caad6dc70 Mon Sep 17 00:00:00 2001 From: Serhey Dolgushev Date: Tue, 18 Sep 2018 13:15:05 +0100 Subject: [PATCH 6/7] Increase persistent disk size Reduce redis & mysql by default to stay under 5Gb limit. Fixes #327 --- .platform.app.yaml | 2 +- .platform/services.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.platform.app.yaml b/.platform.app.yaml index b6051fe6..84c3f5c2 100644 --- a/.platform.app.yaml +++ b/.platform.app.yaml @@ -52,7 +52,7 @@ web: expires: 600 # The size of the persistent disk of the application (in MB). -disk: 2048 +disk: 3072 # The mounts that will be performed when the package is deployed. mounts: diff --git a/.platform/services.yaml b/.platform/services.yaml index 3841f108..2726c9bf 100644 --- a/.platform/services.yaml +++ b/.platform/services.yaml @@ -1,6 +1,6 @@ mysqldb: type: mysql:10.1 - disk: 2048 + disk: 1024 configuration: schemas: - main @@ -30,7 +30,7 @@ rediscache: # have storage space to spare for this, and don't mind a bit slower instance type of redis #redissession: # type: redis-persistent:3.2 -# disk: 1024 +# disk: 512 # If you wish to use solr, uncomment this service and the corresponding relationship in .platform.app.yaml. # Also, you need to generate the config using: From 3d2d2fa66b2da6d37c5a7971265255b5903b751e Mon Sep 17 00:00:00 2001 From: Damian Zabawa Date: Mon, 10 Dec 2018 13:48:41 +0100 Subject: [PATCH 7/7] [composer] removed roave/security-advisories from non-dev dependency --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 1e7ea64c..af56fda6 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,6 @@ "netgen/tagsbundle": "^3.0", "novactive/ezseobundle": "^3.0.0@rc", "oneup/flysystem-bundle": "^3.0", - "roave/security-advisories": "dev-master", "sensio/distribution-bundle": "^5.0.23", "sensio/framework-extra-bundle": "^5.1", "symfony/assetic-bundle": "^2.8.2",