Merge pull request #750 from nextcloud/fix/manual-daemon-duplicate-port

fix(manual-install): prevent duplicate port in ExApp URLs

Author: oleksandr-nc

lib/Command/Daemon/RegisterDaemon.php

@@ -81,6 +81,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			return 1;
 		}
 
+		if ($acceptsDeployId === 'manual-install' && !$isHarp && str_contains($host, ':')) {
+			$output->writeln('<comment>Warning: The host contains a port, which will be ignored for manual-install daemons. The ExApp\'s port from --json-info will be used instead.</comment>');
+		}
+
 		if ($this->daemonConfigService->getDaemonConfigByName($name) !== null) {
 			$output->writeln(sprintf('Registration skipped, as the daemon config `%s` already exists.', $name));
 			return 0;

lib/DeployActions/ManualActions.php

@@ -66,6 +66,7 @@ public function resolveExAppUrl(
 				$host = $deployConfig['additional_options']['OVERRIDE_APP_HOST'];
 			}
 		}
+		$host = explode(':', $host)[0];
 		return sprintf('%s://%s:%s', $protocol, $host, $port);
 	}
 }