Changeset View
Changeset View
Standalone View
Standalone View
devel/gitaly/files/patch-config.toml.example
| --- config.toml.example.orig 2018-04-12 00:44:37 UTC | --- config.toml.example.orig 2018-06-04 16:17:50 UTC | ||||
| +++ config.toml.example | +++ config.toml.example | ||||
| @@ -1,9 +1,9 @@ | @@ -1,9 +1,9 @@ | ||||
| # Example Gitaly configuration file | # Example Gitaly configuration file | ||||
| -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" | -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" | ||||
| +socket_path = "/usr/local/www/gitlab/tmp/sockets/private/gitaly.socket" | +socket_path = "/usr/local/www/gitlab-ce/tmp/sockets/private/gitaly.socket" | ||||
swills: Doesn't have to be now, but at some point references to `/usr/local` in these patches should be… | |||||
Not Done Inline ActionsGood tip, added an issue for it to not forget it: mfechner: Good tip, added an issue for it to not forget it:
https://gitlab.fechner. | |||||
| # The directory where Gitaly's executables are stored | # The directory where Gitaly's executables are stored | ||||
| -bin_dir = "/home/git/gitaly" | -bin_dir = "/home/git/gitaly" | ||||
| +bin_dir = "/usr/local/share/gitaly/bin/" | +bin_dir = "/usr/local/share/gitaly/bin/" | ||||
| # # Optional: listen on a TCP socket. This is insecure (no authentication) | # # Optional: listen on a TCP socket. This is insecure (no authentication) | ||||
| # listen_addr = "localhost:9999" | # listen_addr = "localhost:9999" | ||||
| @@ -14,12 +14,12 @@ bin_dir = "/home/git/gitaly" | @@ -13,12 +13,12 @@ bin_dir = "/home/git/gitaly" | ||||
| # | # prometheus_listen_addr = "localhost:9236" | ||||
| # # Git executable settings | # # Git executable settings | ||||
| -# [git] | -# [git] | ||||
| -# bin_path = "/usr/bin/git" | -# bin_path = "/usr/bin/git" | ||||
| +[git] | +[git] | ||||
| +bin_path = "/usr/local/bin/git" | +bin_path = "/usr/local/bin/git" | ||||
| [[storage]] | [[storage]] | ||||
| name = "default" | name = "default" | ||||
| -path = "/home/git/repositories" | -path = "/home/git/repositories" | ||||
| +path = "/usr/home/git/repositories" | +path = "/usr/home/git/repositories" | ||||
| # # You can optionally configure more storages for this Gitaly instance to serve up | # # You can optionally configure more storages for this Gitaly instance to serve up | ||||
| # | # | ||||
| @@ -42,7 +42,7 @@ path = "/home/git/repositories" | @@ -46,7 +46,7 @@ path = "/home/git/repositories" | ||||
| [gitaly-ruby] | [gitaly-ruby] | ||||
| # The directory where gitaly-ruby is installed | # The directory where gitaly-ruby is installed | ||||
| -dir = "/home/git/gitaly/ruby" | -dir = "/home/git/gitaly/ruby" | ||||
| +dir = "/usr/local/share/gitaly/ruby" | +dir = "/usr/local/share/gitaly/ruby" | ||||
| # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) | # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) | ||||
| # max_rss = 300000000 | # max_rss = 300000000 | ||||
| @@ -55,7 +55,7 @@ dir = "/home/git/gitaly/ruby" | @@ -62,7 +62,7 @@ dir = "/home/git/gitaly/ruby" | ||||
| [gitlab-shell] | [gitlab-shell] | ||||
| # The directory where gitlab-shell is installed | # The directory where gitlab-shell is installed | ||||
| -dir = "/home/git/gitlab-shell" | -dir = "/home/git/gitlab-shell" | ||||
| +dir = "/usr/local/share/gitlab-shell" | +dir = "/usr/local/share/gitlab-shell" | ||||
| # # You can adjust the concurrency of each RPC endpoint | # # You can adjust the concurrency of each RPC endpoint | ||||
| # [[concurrency]] | # [[concurrency]] | ||||
Doesn't have to be now, but at some point references to /usr/local in these patches should be changed to %%PREFIX%% and then a post-patch target should be added to use @REINPLACE_CMD to change %%PREFIX%% to the value of ${PREFIX}.