Setup: Databasehost may be an unix-socket

[obel1x]

Make setup accept unix- sockets without the need to contain ':' in the name.

• Resolves: In the initial setup, entering an UNIX socket for the database host returns error #35378

Summary

Makes it possible to enter fully qualified unix- socket- filenames as Database-Host in setup.

Checklist

could be better next time... think its intuitive to use and works.

[kesselb]

It is already possible to use a format localhost:filename, which didn't seem to be self explaining to me as this is not a common annotation and is not mentioned anywhere.

server/config/config.sample.php

Lines 107 to 113 in cd9f538

	/**
	* Your host server name, for example ``localhost``, ``hostname``,
	* ``hostname.example.com``, or the IP address. To specify a port use
	* ``hostname:####``; to specify a Unix socket use
	* ``/path/to/directory/containing/socket`` e.g. ``/run/postgresql/``.
	*/
	'dbhost' => '',

Hi, I agree our documention is a bit vague about it.
Please add your new syntax to config.sample.php.

[obel1x]

It is already possible to use a format localhost:filename, which didn't seem to be self explaining to me as this is not a common annotation and is not mentioned anywhere.

server/config/config.sample.php

Lines 107 to 113 in cd9f538

	/**
	* Your host server name, for example ``localhost``, ``hostname``,
	* ``hostname.example.com``, or the IP address. To specify a port use
	* ``hostname:####``; to specify a Unix socket use
	* ``/path/to/directory/containing/socket`` e.g. ``/run/postgresql/``.
	*/
	'dbhost' => '',

Hi, I agree our documention is a bit vague about it. Please add your new syntax to config.sample.php.

I don't understand. The file already contains that syntax as you can see - it is just not working that way without my change. Thats why i changed it to work like its written there.

Edit: Oh wait, maybe this is a missunderstanding. My change is covering the INITIAL SETUP DIALOG which is showing up at the first start, before the DB has been set up. It makes it possible to enter values as documented there.

[PVince81]

👍

[kesselb]

Hi @obel1x, thanks again for your pull request 👍

Could you please

• rebase your branch with the latest changes from master to fix some CI errors: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
• sign off the commit git rebase HEAD~1 --signoff, git push --force-with-lease origin master

Have a pleasant week ✌️

[obel1x]

Thank you. i did as you said... after push, there were many differences, so i synced again. Hope now everything is fine

[kesselb]

Index: lib/private/Setup/AbstractDatabase.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php
--- a/lib/private/Setup/AbstractDatabase.php	(revision 26eb0e8b7720616e0b30eca98e50abb509f5beb6)
+++ b/lib/private/Setup/AbstractDatabase.php	(date 1671396664081)
@@ -134,9 +134,9 @@
 			}
 			$connectionParams['host'] = $host;
 		} elseif (strpos($this->dbHost, '/') >= 0) {
-		    // Host variable may only be an unix socket.
-            $connectionParams['unix_socket'] = $this->dbHost;
-		    $connectionParams['host'] = 'localhost';
+			// Host variable may only be an unix socket.
+			$connectionParams['unix_socket'] = $this->dbHost;
+			$connectionParams['host'] = 'localhost';
 		}
 
 		$connectionParams = array_merge($connectionParams, $configOverwrite);

The linter is unhappy. Above patch should fix the linter warnings.
If you have a local development setup you can also run composer cs:fix.

[obel1x]

what the hack... sorry eclipse. now better?

[kesselb]

Linter should be fine now but the sign off for the commits is missing.

git rebase HEAD~3 --signoff
git push --force-with-lease origin master

(to sign off the last 3 commits and push the changes)

[obel1x]

ok, sorry, have not rebased anything before. That has not worked as expected. Also the signature is wrong, don't know how to set it right. think i have to read about signing and come back to this later.

[kesselb]

@obel1x Thank you 👍

It's a bit tricky with forks 😕

Your fork seems a bit out of sync.

I guess it should work to reset your fork to be even with nextcloud/server and apply the patch again: https://github.com/nextcloud/server/commit/3f79a2223502350861d61cbfb5f1a1f526521672.diff

If you prefer I can take your patch and resubmit here.