]>
Commit | Line | Data |
---|---|---|
1e4a3972 ER |
1 | --- gitlab-shell-1.9.5/config.yml 2014-06-02 04:44:18.214779888 +0200 |
2 | +++ gitlab-shell-1.9.5/config.yml 2014-06-02 04:44:18.214779888 +0200 | |
26413cd7 ER |
3 | @@ -1,5 +1,5 @@ |
4 | # GitLab user. git by default | |
5 | -user: git | |
6 | +user: gitlab | |
7 | ||
8 | # Url to gitlab instance. Used for api calls. Should end with a slash. | |
9 | gitlab_url: "http://localhost/" | |
10 | @@ -15,10 +15,10 @@ | |
11 | # Give the canonicalized absolute pathname, | |
12 | # REPOS_PATH MUST NOT CONTAIN ANY SYMLINK!!! | |
13 | # Check twice that none of the components is a symlink, including "/home". | |
14 | -repos_path: "/home/git/repositories" | |
15 | +repos_path: "/var/lib/gitlab/repositories" | |
16 | ||
17 | # File used as authorized_keys for gitlab user | |
18 | -auth_file: "/home/git/.ssh/authorized_keys" | |
19 | +auth_file: "/var/lib/gitlab/.ssh/authorized_keys" | |
20 | ||
21 | # Redis settings used for pushing commit notices to gitlab | |
22 | redis: | |
1e4a3972 ER |
23 | @@ -35,21 +35,21 @@ |
24 | ||
25 | # File that contains the secret key for verifying access to GitLab. | |
26 | # Default is .gitlab_shell_secret in the root directory. | |
27 | -# secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret" | |
28 | +secret_file: "/etc/gitlab/.gitlab_shell_secret" | |
29 | ||
30 | # Redis settings used for pushing commit notices to gitlab | |
31 | redis: | |
32 | bin: /usr/bin/redis-cli | |
33 | - # host: 127.0.0.1 | |
34 | - # port: 6379 | |
35 | + host: 127.0.0.1 | |
36 | + port: 6379 | |
37 | # pass: redispass # Allows you to specify the password for Redis | |
38 | database: 0 | |
39 | - socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP | |
40 | +# socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP | |
41 | namespace: resque:gitlab | |
26413cd7 ER |
42 | |
43 | # Log file. | |
44 | # Default is gitlab-shell.log in the root directory. | |
45 | -# log_file: "/home/git/gitlab-shell/gitlab-shell.log" | |
1e4a3972 | 46 | +log_file: "/var/log/gitlab/gitlab-shell.log" |
26413cd7 ER |
47 | |
48 | # Log level. INFO by default | |
49 | log_level: INFO |