[Bug 225309] www/gitlab Lack of FreeBSD-specific documentation, install bug

bugzilla-noreply at freebsd.org bugzilla-noreply at freebsd.org
Tue Mar 20 18:59:18 UTC 2018


https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=225309

--- Comment #7 from Daniel Eischen <deischen at FreeBSD.org> ---
These should be the only changes necessary to change repo storage.  As for the
ssh keys, I suppose you can just change the auth_file setting in
gitlab-shell/config.yml.  If 3 ports want /usr/local/git as home directory, I
guess you could base gitlab out of a subdirectory of git, like
/usr/local/git/gitlab.  Then the auth_file knob could be set to
/usr/local/git/gitlab/.ssh/authorized_keys, for instance.

Note that below, there's also a fix for gitaly's path not being correct.



--- /usr/local/www/gitlab/config/gitlab.yml.sample      2018-01-22
21:35:41.000000000 -0500
+++ /usr/local/www/gitlab/config/gitlab.yml     2018-02-07 04:02:09.866011000
-0500
@@ -501,7 +501,7 @@
   # Gitaly settings
   gitaly:
     # Path to the directory containing Gitaly client executables.
-    client_path: /home/git/gitaly
+    client_path: /usr/local/share/gitaly
     # Default Gitaly authentication token. Can be overriden per storage. Can
     # be left blank when Gitaly is running locally on a Unix socket, which
     # is the normal way to deploy Gitaly.
@@ -519,7 +519,7 @@
     # real path not the symlink.
     storages: # You must have at least a `default` storage path.
       default:
-        path: /usr/home/git/repositories/
+        path: /usr/local/git/repositories/
         gitaly_address:
unix:/usr/local/www/gitlab/tmp/sockets/private/gitaly.socket # TCP connections
are supported too (e.g. tcp://host:port)
         # gitaly_token: 'special token' # Optional: override global
gitaly.token for this storage.

--- /usr/local/share/gitlab-shell/config.yml.sample     2018-01-04
09:19:17.000000000 -0500
+++ /usr/local/share/gitlab-shell/config.yml    2018-02-06 22:15:00.046361000
-0500
@@ -25,7 +25,7 @@
   self_signed_cert: false

 # File used as authorized_keys for gitlab user
-auth_file: "/home/git/.ssh/authorized_keys"
+auth_file: "/usr/local/git/.ssh/authorized_keys"

 # File that contains the secret key for verifying access to GitLab.
 # Default is .gitlab_shell_secret in the gitlab-shell directory.
--- /usr/local/share/gitaly/config.toml.sample  2018-01-04 06:42:01.000000000
-0500
+++ /usr/local/share/gitaly/config.toml 2018-02-07 19:37:55.425887000 -0500
@@ -16,7 +16,7 @@

 [[storage]]
 name = "default"
-path = "/usr/home/git/repositories"
+path = "/usr/local/git/repositories"

 [gitaly-ruby]
 dir = "/usr/local/bin/ruby"

-- 
You are receiving this mail because:
You are the assignee for the bug.


More information about the freebsd-ports-bugs mailing list