From 85130d454ff6719a82b709c05a51a70fed0a95d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= Date: Mon, 13 Sep 2021 17:07:26 +0200 Subject: [PATCH] Add a warning in the README regarding the memory limit of the database migration Bump the dependencies Enforce small size for tombstones columns Bump the package number --- flexiapi/README.md | 2 + flexiapi/composer.lock | 62 +++++++++---------- ...6_132040_add_accounts_tombstones_table.php | 4 +- flexisip-account-manager.spec | 4 +- 4 files changed, 37 insertions(+), 35 deletions(-) diff --git a/flexiapi/README.md b/flexiapi/README.md index c4a8e25..ed0f814 100644 --- a/flexiapi/README.md +++ b/flexiapi/README.md @@ -127,6 +127,8 @@ FlexiAPI is shipped with several console commands that you can launch using the FlexiAPI needs an empty database to run its migration. The following console command allow you to import simultanously an exisiting Flexisip database and the old FlexiAPI SQLite database file (if you have one) in the new one. To do so, please specify the new database configuration in the `.env` file and run the following command. +The migration script requires at least 300mb of memory to run. You should edit the `memory_limit` in the `php.ini` file to increase it. + php artisan db:import {old_dbname} {old_sqlite_file_path?} --username={old_username} --password={old_password} Several other parameters are also available to customize the migration process, you can list them all using the command documentation. diff --git a/flexiapi/composer.lock b/flexiapi/composer.lock index 995250b..425b899 100644 --- a/flexiapi/composer.lock +++ b/flexiapi/composer.lock @@ -978,16 +978,16 @@ }, { "name": "laravel/framework", - "version": "v8.58.0", + "version": "v8.60.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "1b819bf99d87bd543a4d4895e5b3350f61ea7a23" + "reference": "44f16a31a1d4ac8a51605550d7796e2273984a48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1b819bf99d87bd543a4d4895e5b3350f61ea7a23", - "reference": "1b819bf99d87bd543a4d4895e5b3350f61ea7a23", + "url": "https://api.github.com/repos/laravel/framework/zipball/44f16a31a1d4ac8a51605550d7796e2273984a48", + "reference": "44f16a31a1d4ac8a51605550d7796e2273984a48", "shasum": "" }, "require": { @@ -1142,7 +1142,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2021-08-31T13:55:57+00:00" + "time": "2021-09-08T13:37:21+00:00" }, { "name": "laravel/tinker", @@ -1633,16 +1633,16 @@ }, { "name": "nesbot/carbon", - "version": "2.53.0", + "version": "2.53.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "875f62a876f476d8a6040381e4b2673b3d4a28fe" + "reference": "f4655858a784988f880c1b8c7feabbf02dfdf045" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/875f62a876f476d8a6040381e4b2673b3d4a28fe", - "reference": "875f62a876f476d8a6040381e4b2673b3d4a28fe", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f4655858a784988f880c1b8c7feabbf02dfdf045", + "reference": "f4655858a784988f880c1b8c7feabbf02dfdf045", "shasum": "" }, "require": { @@ -1723,7 +1723,7 @@ "type": "tidelift" } ], - "time": "2021-09-06T07:30:54+00:00" + "time": "2021-09-06T09:29:23+00:00" }, { "name": "nikic/php-parser", @@ -5316,16 +5316,16 @@ }, { "name": "facade/flare-client-php", - "version": "1.8.1", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/facade/flare-client-php.git", - "reference": "47b639dc02bcfdfc4ebb83de703856fa01e35f5f" + "reference": "b2adf1512755637d0cef4f7d1b54301325ac78ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/flare-client-php/zipball/47b639dc02bcfdfc4ebb83de703856fa01e35f5f", - "reference": "47b639dc02bcfdfc4ebb83de703856fa01e35f5f", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/b2adf1512755637d0cef4f7d1b54301325ac78ed", + "reference": "b2adf1512755637d0cef4f7d1b54301325ac78ed", "shasum": "" }, "require": { @@ -5369,7 +5369,7 @@ ], "support": { "issues": "https://github.com/facade/flare-client-php/issues", - "source": "https://github.com/facade/flare-client-php/tree/1.8.1" + "source": "https://github.com/facade/flare-client-php/tree/1.9.1" }, "funding": [ { @@ -5377,26 +5377,26 @@ "type": "github" } ], - "time": "2021-05-31T19:23:29+00:00" + "time": "2021-09-13T12:16:46+00:00" }, { "name": "facade/ignition", - "version": "2.12.0", + "version": "2.13.1", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "74dcc32a2895a126d1e5f2cd3bbab499cac66db1" + "reference": "e3f49bef7b4165fa4b8a9dc579e7b63fa06aef78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/74dcc32a2895a126d1e5f2cd3bbab499cac66db1", - "reference": "74dcc32a2895a126d1e5f2cd3bbab499cac66db1", + "url": "https://api.github.com/repos/facade/ignition/zipball/e3f49bef7b4165fa4b8a9dc579e7b63fa06aef78", + "reference": "e3f49bef7b4165fa4b8a9dc579e7b63fa06aef78", "shasum": "" }, "require": { "ext-json": "*", "ext-mbstring": "*", - "facade/flare-client-php": "^1.6", + "facade/flare-client-php": "^1.9.1", "facade/ignition-contracts": "^1.0.2", "illuminate/support": "^7.0|^8.0", "monolog/monolog": "^2.0", @@ -5453,7 +5453,7 @@ "issues": "https://github.com/facade/ignition/issues", "source": "https://github.com/facade/ignition" }, - "time": "2021-08-24T09:53:54+00:00" + "time": "2021-09-13T13:01:30+00:00" }, { "name": "facade/ignition-contracts", @@ -6239,33 +6239,33 @@ }, { "name": "phpspec/prophecy", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea" + "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea", - "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", + "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.1", + "php": "^7.2 || ~8.0, <8.2", "phpdocumentor/reflection-docblock": "^5.2", "sebastian/comparator": "^3.0 || ^4.0", "sebastian/recursion-context": "^3.0 || ^4.0" }, "require-dev": { - "phpspec/phpspec": "^6.0", + "phpspec/phpspec": "^6.0 || ^7.0", "phpunit/phpunit": "^8.0 || ^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -6300,9 +6300,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/1.13.0" + "source": "https://github.com/phpspec/prophecy/tree/1.14.0" }, - "time": "2021-03-17T13:42:18+00:00" + "time": "2021-09-10T09:02:12+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/flexiapi/database/migrations/2021_09_06_132040_add_accounts_tombstones_table.php b/flexiapi/database/migrations/2021_09_06_132040_add_accounts_tombstones_table.php index a8c5e37..43fdcf1 100644 --- a/flexiapi/database/migrations/2021_09_06_132040_add_accounts_tombstones_table.php +++ b/flexiapi/database/migrations/2021_09_06_132040_add_accounts_tombstones_table.php @@ -10,8 +10,8 @@ class AddAccountsTombstonesTable extends Migration { Schema::create('accounts_tombstones', function (Blueprint $table) { $table->id(); - $table->string('username'); - $table->string('domain'); + $table->string('username', 64); + $table->string('domain', 64); $table->timestamps(); $table->unique(['username', 'domain']); diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec index 8f3075c..adbc1f6 100644 --- a/flexisip-account-manager.spec +++ b/flexisip-account-manager.spec @@ -8,7 +8,7 @@ #%define _datadir %{_datarootdir} #%define _docdir %{_datadir}/doc -%define build_number 101 +%define build_number 102 %define var_dir /var/opt/belledonne-communications %define opt_dir /opt/belledonne-communications/share/flexisip-account-manager @@ -86,7 +86,7 @@ cp -R conf/* "$RPM_BUILD_ROOT/etc/flexisip-account-manager/" # FlexiAPI base directories setup and rights mkdir -p %{var_dir}/flexiapi/storage/app/public - mkdir -p %{var_dir}/flexiapi/storage/framework/cache + mkdir -p %{var_dir}/flexiapi/storage/framework/cache/data mkdir -p %{var_dir}/flexiapi/storage/framework/sessions mkdir -p %{var_dir}/flexiapi/storage/framework/testing mkdir -p %{var_dir}/flexiapi/storage/framework/views