1 --- gitlabhq-8.10.2/config/gitlab.yml~ 2016-07-28 14:33:30.000000000 +0300
2 +++ gitlabhq-8.10.2/config/gitlab.yml 2016-07-28 14:34:15.268930594 +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/
23 ## GitLab Shell settings
25 - path: /home/git/gitlab-shell/
26 - hooks_path: /home/git/gitlab-shell/hooks/
27 + path: /usr/share/gitlab-shell/
28 + hooks_path: /usr/share/gitlab-shell/hooks/
30 # File that contains the secret key for verifying access for gitlab-shell.
31 # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).
32 - # secret_file: /home/git/gitlab/.gitlab_shell_secret
33 + secret_file: /etc/gitlab/.gitlab_shell_secret
37 --- gitlabhq-8.7.5/config/unicorn.rb 2016-05-12 17:35:19.000000000 +0300
38 +++ gitlabhq-8.7.5.paths/config/unicorn.rb 2016-05-15 21:30:47.263911838 +0300
41 # Help ensure your application will always spawn in the symlinked
42 # "current" directory that Capistrano sets up.
43 -working_directory "/home/git/gitlab" # available in 0.94.0+
44 +working_directory "/var/lib/gitlab" # available in 0.94.0+
46 # Listen on both a Unix domain socket and a TCP port.
47 # If you are load-balancing multiple Unicorn masters, lower the backlog
48 # setting to e.g. 64 for faster failover.
49 -listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024
50 +listen "/var/run/gitlab/gitlab.socket", :backlog => 1024
51 listen "127.0.0.1:8080", :tcp_nopush => true
53 # nuke workers after 30 seconds instead of 60 seconds (the default)
57 # feel free to point this anywhere accessible on the filesystem
58 -pid "/home/git/gitlab/tmp/pids/unicorn.pid"
59 +pid "/var/run/gitlab/unicorn.pid"
61 # By default, the Unicorn logger will write to stderr.
62 # Additionally, some applications/frameworks log to stderr or stdout,
63 # so prevent them from going to /dev/null when daemonized here:
64 -stderr_path "/home/git/gitlab/log/unicorn.stderr.log"
65 -stdout_path "/home/git/gitlab/log/unicorn.stdout.log"
66 +stderr_path "/var/lib/gitlab/log/unicorn.stderr.log"
67 +stdout_path "/var/lib/gitlab/log/unicorn.stdout.log"
69 # combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
70 # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
71 --- gitlabhq-8.7.5/config/database.yml.mysql 2016-05-12 17:35:19.000000000 +0300
72 +++ gitlabhq-8.7.5/config/database.yml 2016-04-17 13:53:42.000000000 +0300
75 database: gitlabhq_production
78 - password: "secure password"
82 # socket: /tmp/mysql.sock
86 database: gitlabhq_development
89 - password: "secure password"
92 # socket: /tmp/mysql.sock
94 # Warning: The database defined as "test" will be erased and