From 64ddac3a1fdf0e75dc276e2f4504970892296966 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 3 Apr 2020 11:39:16 +0400 Subject: [PATCH 1/9] PHRAS-3007 Rename geoloc config --- package.json | 2 +- .../Core/Configuration/Fixtures/configuration-setup.yml | 2 +- .../Phrasea/Core/Configuration/Fixtures/configuration.yml | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 232c24d86b..f314ad1382 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.160-d", + "phraseanet-production-client": "0.34.163-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml index 33bd2ddb84..3225c421ad 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml +++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml @@ -226,7 +226,7 @@ geocoding-providers: position-fields: - name: GpsCompositePosition - type: latlng + type: latlon # - # name: Longitude # type: lng diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml index 33bd2ddb84..3225c421ad 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml +++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml @@ -226,7 +226,7 @@ geocoding-providers: position-fields: - name: GpsCompositePosition - type: latlng + type: latlon # - # name: Longitude # type: lng diff --git a/yarn.lock b/yarn.lock index 4a5be0c837..c72a8798fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.160-d: - version "0.34.160-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.160-d.tgz#3deb3387b54e56aec73b073cae8cc013cc316999" - integrity sha512-00jnCOCDrLowL8TE+h8mH+Lg4P0+EQPSDOXN2Lq6KF577GGu0OWQRh2YmUeXkacHTUT4N0u39IsBkkBYqorVnQ== +phraseanet-production-client@0.34.163-d: + version "0.34.163-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.163-d.tgz#7977a3df59ac8e5454fe844a0e4e027ae9b04ca1" + integrity sha512-pKqgCN4PcdR6DDeuaexjO5D5YYjaPFVe/Cv+gfvIE7azEdM8y/QCnrlSfbPpluiLB8L/0FEUXZvhBp+qa/k/uA== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 2cb76f396b6bce3eb943a77e1b1b9529c602b33a Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Fri, 3 Apr 2020 11:23:33 +0200 Subject: [PATCH 2/9] Report change in configuration.yml --- lib/conf.d/configuration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index f237b8318f..d6574a5d41 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -290,10 +290,10 @@ geocoding-providers: position-fields: [] #- # name: GpsCompositePosition - # type: latlng + # type: latlon # - # name: Longitude - # type: lng + # type: lon # - # name: Latitude # type: lat From 66a5895958a72dc09202206ca6c2848da47f748e Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 3 Apr 2020 14:31:25 +0400 Subject: [PATCH 3/9] PHRAS-3007 --- package.json | 2 +- .../Core/Configuration/Fixtures/configuration-setup.yml | 2 +- .../Phrasea/Core/Configuration/Fixtures/configuration.yml | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index f314ad1382..62f4f85e01 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.163-d", + "phraseanet-production-client": "0.34.164-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml index 3225c421ad..33bd2ddb84 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml +++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml @@ -226,7 +226,7 @@ geocoding-providers: position-fields: - name: GpsCompositePosition - type: latlon + type: latlng # - # name: Longitude # type: lng diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml index 3225c421ad..33bd2ddb84 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml +++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml @@ -226,7 +226,7 @@ geocoding-providers: position-fields: - name: GpsCompositePosition - type: latlon + type: latlng # - # name: Longitude # type: lng diff --git a/yarn.lock b/yarn.lock index c72a8798fe..7bd8e532be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.163-d: - version "0.34.163-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.163-d.tgz#7977a3df59ac8e5454fe844a0e4e027ae9b04ca1" - integrity sha512-pKqgCN4PcdR6DDeuaexjO5D5YYjaPFVe/Cv+gfvIE7azEdM8y/QCnrlSfbPpluiLB8L/0FEUXZvhBp+qa/k/uA== +phraseanet-production-client@0.34.164-d: + version "0.34.164-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.164-d.tgz#ba3560fceb2a282b9938afbc1b53e87d6852b638" + integrity sha512-iDLvQEAxTcTp3ZyL6o3GYvdIsCvWt3lG5tBVQ4KU0p8XSFF3CoavbtiYB/VP0//7FaWybZkvA9h0+zZ1JIMCMA== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 99c2528cb340cef9c487721f4f331ec1495264f6 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 3 Apr 2020 14:34:01 +0400 Subject: [PATCH 4/9] PHRAS-3007 --- lib/conf.d/configuration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index d6574a5d41..3b1160055d 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -290,7 +290,7 @@ geocoding-providers: position-fields: [] #- # name: GpsCompositePosition - # type: latlon + # type: latlng # - # name: Longitude # type: lon From fa0332522f75cea62e67ade3c454ddd46a286b94 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 3 Apr 2020 19:20:14 +0400 Subject: [PATCH 5/9] PHRAS-3007 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 62f4f85e01..1bf08bc715 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.164-d", + "phraseanet-production-client": "0.34.166-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index 7bd8e532be..b5af4ae091 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.164-d: - version "0.34.164-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.164-d.tgz#ba3560fceb2a282b9938afbc1b53e87d6852b638" - integrity sha512-iDLvQEAxTcTp3ZyL6o3GYvdIsCvWt3lG5tBVQ4KU0p8XSFF3CoavbtiYB/VP0//7FaWybZkvA9h0+zZ1JIMCMA== +phraseanet-production-client@0.34.166-d: + version "0.34.166-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.166-d.tgz#ba898172b356b9d724c5b2d44914aaff20dfa404" + integrity sha512-FRRQCskGDJvwREuagCxn7i7WvGWvmJhHibeX/yGo8n+fPpf9Xl3/vT4TK1RUyRlHwym+BxdZMulUfgmd7eomVw== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From aef7e015cb3eb59f006970d245568c801bbbec0a Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 6 Apr 2020 14:59:32 +0400 Subject: [PATCH 6/9] PHRAS-3007 #comment upgrade phraseanet-production-client --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1bf08bc715..bc82a8d939 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.166-d", + "phraseanet-production-client": "0.34.167-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index b5af4ae091..533722df39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.166-d: - version "0.34.166-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.166-d.tgz#ba898172b356b9d724c5b2d44914aaff20dfa404" - integrity sha512-FRRQCskGDJvwREuagCxn7i7WvGWvmJhHibeX/yGo8n+fPpf9Xl3/vT4TK1RUyRlHwym+BxdZMulUfgmd7eomVw== +phraseanet-production-client@0.34.167-d: + version "0.34.167-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.167-d.tgz#d40f2e74a9ee45eb60ed3c540d7b68bd2fdc3ff7" + integrity sha512-rxQFCzVKW9oCVC4Oi/hvsDBYLYy3IdzFh2jUkPb5tD63aH9WdNEvlnjlcks6qCWl2aLI8ErPL1lPfUP5VZ8Ohw== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 76692bf3cc69fdac9cda2a8f3188409aacd88bc9 Mon Sep 17 00:00:00 2001 From: Jean-Yves Gaulier Date: Tue, 7 Apr 2020 11:22:10 +0200 Subject: [PATCH 7/9] PHRAS-3018_reject-php32_4.1 fix : reject install if not php64 --- lib/Alchemy/Phrasea/Command/Setup/Install.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Command/Setup/Install.php b/lib/Alchemy/Phrasea/Command/Setup/Install.php index 8e211a9284..4682eda55a 100644 --- a/lib/Alchemy/Phrasea/Command/Setup/Install.php +++ b/lib/Alchemy/Phrasea/Command/Setup/Install.php @@ -55,7 +55,9 @@ class Install extends Command ->addOption('es-host', null, InputOption::VALUE_OPTIONAL, 'ElasticSearch server HTTP host', 'localhost') ->addOption('es-port', null, InputOption::VALUE_OPTIONAL, 'ElasticSearch server HTTP port', 9200) ->addOption('es-index', null, InputOption::VALUE_OPTIONAL, 'ElasticSearch index name', null) - ->addOption('yes', 'y', InputOption::VALUE_NONE, 'Answer yes to all questions'); + ->addOption('yes', 'y', InputOption::VALUE_NONE, 'Answer yes to all questions') + ->setHelp("Phraseanet can only be installed on 64 bits PHP."); + ; return $this; } @@ -75,6 +77,14 @@ class Install extends Command */ protected function doExecute(InputInterface $input, OutputInterface $output) { + if(PHP_INT_SIZE !== 8) { + $output->writeln(sprintf( + "Phraseanet can only be installed on 64 bits PHP, your version is %d bits (PHP_INT_SIZE=%d).", + PHP_INT_SIZE<<3,PHP_INT_SIZE + )); + return -1; + } + /** @var DialogHelper $dialog */ $dialog = $this->getHelperSet()->get('dialog'); From 06c98244c94e055e8e60fd21084da7216dc89a30 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 7 Apr 2020 18:54:05 +0400 Subject: [PATCH 8/9] PHRAS-3007 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index bc82a8d939..00df1ba039 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.167-d", + "phraseanet-production-client": "0.34.168-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index 533722df39..10d8512899 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.167-d: - version "0.34.167-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.167-d.tgz#d40f2e74a9ee45eb60ed3c540d7b68bd2fdc3ff7" - integrity sha512-rxQFCzVKW9oCVC4Oi/hvsDBYLYy3IdzFh2jUkPb5tD63aH9WdNEvlnjlcks6qCWl2aLI8ErPL1lPfUP5VZ8Ohw== +phraseanet-production-client@0.34.168-d: + version "0.34.168-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.168-d.tgz#97adb25a7be0de428b3bcd94650315c84d8d3a20" + integrity sha512-hYkPwqESGbzr2/YG7IZcFfIhom8x5kO1nniEXHonz+KRK4SaYWvJ9bD67ePc8G9VO0EenkRoZX1rRcn5dWLa9w== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 134069e5677f07aaee8c4f287b9883b78a9f69e3 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Tue, 7 Apr 2020 19:14:41 +0200 Subject: [PATCH 9/9] fix for worker and scheduler in configuration.yml --- docker/phraseanet/auto-install.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docker/phraseanet/auto-install.sh b/docker/phraseanet/auto-install.sh index 5ad05e134c..cd81110c9e 100755 --- a/docker/phraseanet/auto-install.sh +++ b/docker/phraseanet/auto-install.sh @@ -38,14 +38,15 @@ fi /var/alchemy/Phraseanet/bin/setup system:config set main.cache.options.namespace $INSTALL_SERVER_NAME /var/alchemy/Phraseanet/bin/setup system:config set main.cache.type redis -# RabbitMQ -bin/setup system:config set rabbitmq.server.host rabbitmq -bin/setup system:config set rabbitmq.server.port 5672 -bin/setup system:config set rabbitmq.server.user $INSTALL_RABBITMQ_USER -bin/setup system:config set rabbitmq.server.password $INSTALL_RABBITMQ_PASSWORD -bin/setup system:config set rabbitmq.server.vhost / - +# Bus configuration for scheduler & worker +bin/setup system:config set workers.queue.worker-queue.registry alchemy_worker.queue_registry +bin/setup system:config set workers.queue.worker-queue.host rabbitmq +bin/setup system:config set workers.queue.worker-queue.port 5672 +bin/setup system:config set workers.queue.worker-queue.user $INSTALL_RABBITMQ_USER +bin/setup system:config set workers.queue.worker-queue.password $INSTALL_RABBITMQ_PASSWORD +bin/setup system:config set workers.queue.worker-queue.vhost / +# Create elasticsearch index /var/alchemy/Phraseanet/bin/console searchengine:index -c ## enable API and disable ssl on it