Add support for SSL on Redis and RabbitMQ connections

hamidpeywasti · Nov 25, 2023 · 17e0c91 · 17e0c91
1 parent 48d7388
commit 17e0c91
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -46,11 +46,11 @@
         "php-middleware/request-id": "^4.1",
         "pugx/shortid-php": "^1.1",
         "ramsey/uuid": "^4.7",
-        "shlinkio/shlink-common": "dev-main#e24ea7b as 5.7",
+        "shlinkio/shlink-common": "dev-main#a9b5d21 as 5.7",
         "shlinkio/shlink-config": "dev-main#cde5d3b as 2.5",
         "shlinkio/shlink-event-dispatcher": "dev-main#35ccc0b as 3.1",
         "shlinkio/shlink-importer": "dev-main#d621b20 as 5.2",
-        "shlinkio/shlink-installer": "dev-develop#f31c242 as 8.6",
+        "shlinkio/shlink-installer": "dev-develop#18829f7 as 8.6",
         "shlinkio/shlink-ip-geolocation": "dev-main#4a1cef8 as 3.3",
         "shlinkio/shlink-json": "dev-main#e5a111c as 1.1",
         "spiral/roadrunner": "^2023.2",

diff --git a/config/autoload/installer.global.php b/config/autoload/installer.global.php
@@ -64,6 +64,7 @@
             Option\QrCode\DefaultRoundBlockSizeConfigOption::class,
             Option\RabbitMq\RabbitMqEnabledConfigOption::class,
             Option\RabbitMq\RabbitMqHostConfigOption::class,
+            Option\RabbitMq\RabbitMqUseSslConfigOption::class,
             Option\RabbitMq\RabbitMqPortConfigOption::class,
             Option\RabbitMq\RabbitMqUserConfigOption::class,
             Option\RabbitMq\RabbitMqPasswordConfigOption::class,

diff --git a/config/autoload/rabbit.global.php b/config/autoload/rabbit.global.php
@@ -9,6 +9,7 @@
     'rabbitmq' => [
         'enabled' => (bool) EnvVars::RABBITMQ_ENABLED->loadFromEnv(false),
         'host' => EnvVars::RABBITMQ_HOST->loadFromEnv(),
+        'use_ssl' => (bool) EnvVars::RABBITMQ_USE_SSL->loadFromEnv(false),
         'port' => (int) EnvVars::RABBITMQ_PORT->loadFromEnv('5672'),
         'user' => EnvVars::RABBITMQ_USER->loadFromEnv(),
         'password' => EnvVars::RABBITMQ_PASSWORD->loadFromEnv(),

diff --git a/module/Core/src/Config/EnvVars.php b/module/Core/src/Config/EnvVars.php
@@ -31,6 +31,7 @@ enum EnvVars: string
     case RABBITMQ_USER = 'RABBITMQ_USER';
     case RABBITMQ_PASSWORD = 'RABBITMQ_PASSWORD';
     case RABBITMQ_VHOST = 'RABBITMQ_VHOST';
+    case RABBITMQ_USE_SSL = 'RABBITMQ_USE_SSL';
     /** @deprecated */
     case RABBITMQ_LEGACY_VISITS_PUBLISHING = 'RABBITMQ_LEGACY_VISITS_PUBLISHING';
     case MATOMO_ENABLED = 'MATOMO_ENABLED';