Настройки реббит в переменную окружения

diff --git a/erp24/.env.example b/erp24/.env.example
index 971b06b007b8cd4d1a9515250a1dc8c22083a701..5e391bb098e1895416d4a0b189d63a508e5a29ea 100644 (file)
--- a/erp24/.env.example
+++ b/erp24/.env.example
@@ -1,2 +1,3 @@
 APP_ENV=development
-SERVER_NAME=local-fomichev
\ No newline at end of file
+SERVER_NAME=local-fomichev
+RABBIT_HOST=rabbitmq-yii_erp24
\ No newline at end of file

diff --git a/erp24/api2/config/api2.config.php b/erp24/api2/config/api2.config.php
index fce0ee6c40204d16671f3031a8349245898fbae3..6733839b21117c15a815d07843cac1470447b48f 100644 (file)
--- a/erp24/api2/config/api2.config.php
+++ b/erp24/api2/config/api2.config.php
@@ -64,8 +64,7 @@ return [
         ],
         'queue' => [
             'class' => Queue::class,
-            //'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672',
-            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672',
+            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,
             'ttr' => 300, // Время для выполнения задания

diff --git a/erp24/config/console.php b/erp24/config/console.php
index abb400af9214b1a1bdad5872fb33188f7894a76d..41cd21a313f3534af6dd2966e8f21477412731f2 100755 (executable)
--- a/erp24/config/console.php
+++ b/erp24/config/console.php
@@ -42,8 +42,7 @@ $config = [
 //        ],
         'queue' => [
             'class' => Queue::class,
-           // 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672',
-            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672',
+            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,
             'ttr' => 300, // Время для выполнения задания

diff --git a/erp24/config/dev.console.config.php b/erp24/config/dev.console.config.php
index c9407f84bad7fa24dfff3d05bbf10af72f99022c..be54e1cc0e6b8bca4b95d4e56ef8423387d6647a 100755 (executable)
--- a/erp24/config/dev.console.config.php
+++ b/erp24/config/dev.console.config.php
@@ -63,8 +63,7 @@ return [
         ],
         'queue' => [
             'class' => Queue::class,
-            // 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672',
-            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672',
+            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,
             'ttr' => 300, // Время для выполнения задания

diff --git a/erp24/config/params.php b/erp24/config/params.php
index 8efe83b30a644f0ddeaa02c642b217b2adc0dbd0..8c95f87b138a0efebdc15bfd8dec45b9b2de33b3 100644 (file)
--- a/erp24/config/params.php
+++ b/erp24/config/params.php
@@ -16,4 +16,5 @@ return [
     ],
     'SWITCH_USER_COOKIE_PASSWORD' => '123pass@WORD',
     'YANDEX_MARKET_API_KEY' => 'ACMA:r3sa2VyjkgcO0aOxGoyAWuGH15g5mWAqXRMuylVA:a0bccb7e',
+    'RABBIT_HOST' => getenv('RABBIT_HOST') ?: 'localhost',
 ];

diff --git a/erp24/config/prod.console.config.php b/erp24/config/prod.console.config.php
index e9d1babf7bb96092fd9d577af5f0fc3f73a6324f..9b65a3502386496025f7faf9e6f1483c587c8fb4 100755 (executable)
--- a/erp24/config/prod.console.config.php
+++ b/erp24/config/prod.console.config.php
@@ -62,8 +62,7 @@ return [
         ],
         'queue' => [
             'class' => Queue::class,
-            // 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672',
-            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672',
+            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,
             'ttr' => 300, // Время для выполнения задания

diff --git a/erp24/config/web.php b/erp24/config/web.php
index 874a787cffbab6fa48529b26386c64cf4b859def..86d50abd958305a81d9ec57d9731c95b8c3c7ca3 100644 (file)
--- a/erp24/config/web.php
+++ b/erp24/config/web.php
@@ -42,8 +42,7 @@ $config = [
         ],
         'queue' => [
             'class' => Queue::class,
-            // 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672',
-            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672',
+            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,
             'ttr' => 300, // Время для выполнения задания

diff --git a/erp24/media/config/media.config.php b/erp24/media/config/media.config.php
index f49f217a9d14046c55beb516a7e9fae58115d7bf..bf13a7248e9fdb8e8002332e386ab43116faf2a6 100644 (file)
--- a/erp24/media/config/media.config.php
+++ b/erp24/media/config/media.config.php
@@ -25,8 +25,7 @@ return [
         ],
         'queue' => [
             'class' => Queue::class,
-            //'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672',
-            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672',
+            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,
             'ttr' => 300, // Время для выполнения задания