From 73c813eded44f314919ffa1f503511e6492dcc03 Mon Sep 17 00:00:00 2001
From: Jan Schuppik <114286749+Jan-Schuppik@users.noreply.github.com>
Date: Wed, 20 Aug 2025 09:27:31 +0200
Subject: [PATCH] Fix/icingacli setup fpm flag (#5411)

resolves #5409

Only use default value for --fpm-url if neither --fpm-url or
--fpm-socket-path is set.
---
 .../setup/application/clicommands/ConfigCommand.php  | 12 ++++++------
 modules/setup/library/Setup/Webserver/Apache.php     | 11 +++--------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php
index db139cf79..9086906c7 100644
--- a/modules/setup/application/clicommands/ConfigCommand.php
+++ b/modules/setup/application/clicommands/ConfigCommand.php
@@ -103,10 +103,12 @@ class ConfigCommand extends Command
      *  --enable-fpm                        Enable FPM handler for Apache (Nginx is always enabled)
      *
      *  --fpm-url=<url>                     Address where to pass requests to FPM [127.0.0.1:9000]
+     *                                      Only one of --fpm-socket-path or --fpm-url can be set at a time
      *
      *  --fpm-uri=<uri>                     Alias for --fpm-url
      *
-     *  --fpm-socket-path=<socketpath>      Socket path where to pass requests to FPM, overrides --fpm-url
+     *  --fpm-socket-path=<socketpath>      Socket path where to pass requests to FPM
+     *                                      Only one of --fpm-socket-path or --fpm-url can be set at a time
      *
      *  --config=<directory>                Path to Icinga Web 2's configuration files [/etc/icingaweb2]
      *
@@ -166,14 +168,12 @@ class ConfigCommand extends Command
         $enableFpm = $this->params->shift('enable-fpm', $webserver->getEnableFpm());
 
         $fpmSocketPath = trim($this->params->get('fpm-socket-path', $webserver->getFpmSocketPath()));
-        $fpmUrl = trim($this->params->get('fpm-url', $webserver->getFpmUrl()));
+        $fpmUrl = trim($this->params->get('fpm-url'));
         if (empty($fpmUrl)) {
-            $fpmUrl = trim($this->params->get('fpm-uri', $webserver->getFpmUrl()));
+            $fpmUrl = trim($this->params->get('fpm-uri'));
         }
         if (empty($fpmSocketPath) && empty($fpmUrl)) {
-            $this->fail($this->translate(
-                'One of the arguments --fpm-socket-path or --fpm-url must be set to pass requests to FPM'
-            ));
+            $fpmUrl = $webserver->getFpmUrl();
         } elseif (!empty($fpmSocketPath) && !empty($fpmUrl)) {
             $this->fail($this->translate(
                 'Only one of the arguments --fpm-socket-path or --fpm-url must be set to pass requests to FPM'
diff --git a/modules/setup/library/Setup/Webserver/Apache.php b/modules/setup/library/Setup/Webserver/Apache.php
index 00212ffec..190f16b21 100644
--- a/modules/setup/library/Setup/Webserver/Apache.php
+++ b/modules/setup/library/Setup/Webserver/Apache.php
@@ -16,14 +16,9 @@ class Apache extends Webserver
 
     protected function createFpmUri()
     {
-        $apacheFpmUri = "";
-        if (empty($this->fpmSocketPath)) {
-            $apacheFpmUri = $this->fpmUrlSchema . $this->fpmUrl;
-        } else {
-            $apacheFpmUri = $this->fpmSocketSchema . $this->fpmSocketPath . '|' . $this->fpmUrlSchema . 'localhost';
-        }
-
-        return $apacheFpmUri;
+        return empty($this->fpmSocketPath)
+            ? $this->fpmUrlSchema . $this->fpmUrl
+            : $this->fpmSocketSchema . $this->fpmSocketPath . '|' . $this->fpmUrlSchema . 'localhost';
     }
 
     protected function getTemplate()