1 --- gitlabhq-8.10.2/config/gitlab.yml 2016-07-28 14:34:15.268930594 +0300
2 +++ gitlabhq-8.11.3/config/gitlab.yml 2016-08-30 09:23:24.191326482 +0300
6 # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
10 ## Date & Time settings
11 # Uncomment and customize if you want to change the default time zone of GitLab application.
13 # least. This setting is fed to 'rm -rf' in
14 # db/migrate/20151023144219_remove_satellites.rb
16 - path: /home/git/gitlab-satellites/
17 + path: /var/lib/gitlab/satellites/
22 # Paths where repositories can be stored. Give the canonicalized absolute pathname.
23 # NOTE: REPOS PATHS MUST NOT CONTAIN ANY SYMLINK!!!
24 storages: # You must have at least a `default` storage path.
25 - default: /home/git/repositories/
26 + default: /var/lib/gitlab/repositories/
32 ## GitLab Shell settings
34 - path: /home/git/gitlab-shell/
35 - hooks_path: /home/git/gitlab-shell/hooks/
36 + path: /usr/share/gitlab-shell/
37 + hooks_path: /usr/share/gitlab-shell/hooks/
39 # File that contains the secret key for verifying access for gitlab-shell.
40 # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).
41 - # secret_file: /home/git/gitlab/.gitlab_shell_secret
42 + secret_file: /etc/gitlab/.gitlab_shell_secret
46 --- gitlabhq-8.7.5/config/unicorn.rb 2016-05-12 17:35:19.000000000 +0300
47 +++ gitlabhq-8.7.5.paths/config/unicorn.rb 2016-05-15 21:30:47.263911838 +0300
50 # Help ensure your application will always spawn in the symlinked
51 # "current" directory that Capistrano sets up.
52 -working_directory "/home/git/gitlab" # available in 0.94.0+
53 +working_directory "/usr/lib/gitlab" # available in 0.94.0+
55 # Listen on both a Unix domain socket and a TCP port.
56 # If you are load-balancing multiple Unicorn masters, lower the backlog
57 # setting to e.g. 64 for faster failover.
58 -listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024
59 +listen "/var/run/gitlab/gitlab.socket", :backlog => 1024
60 listen "127.0.0.1:8080", :tcp_nopush => true
62 # nuke workers after 30 seconds instead of 60 seconds (the default)
66 # feel free to point this anywhere accessible on the filesystem
67 -pid "/home/git/gitlab/tmp/pids/unicorn.pid"
68 +pid "/var/run/gitlab/unicorn.pid"
70 # By default, the Unicorn logger will write to stderr.
71 # Additionally, some applications/frameworks log to stderr or stdout,
72 # so prevent them from going to /dev/null when daemonized here:
73 -stderr_path "/home/git/gitlab/log/unicorn.stderr.log"
74 -stdout_path "/home/git/gitlab/log/unicorn.stdout.log"
75 +stderr_path "/var/log/gitlab/unicorn.stderr.log"
76 +stdout_path "/var/log/gitlab/unicorn.stdout.log"
78 # combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
79 # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
80 --- gitlabhq-8.7.5/config/database.yml.mysql 2016-05-12 17:35:19.000000000 +0300
81 +++ gitlabhq-8.7.5/config/database.yml 2016-04-17 13:53:42.000000000 +0300
84 database: gitlabhq_production
87 - password: "secure password"
91 # socket: /tmp/mysql.sock
95 database: gitlabhq_development
98 - password: "secure password"
101 # socket: /tmp/mysql.sock
103 # Warning: The database defined as "test" will be erased and