pyrox.dev
1diff --git a/config/environments/production.rb b/config/environments/production.rb
2index 78bf543..9b37122 100644
3--- a/config/environments/production.rb
4+++ b/config/environments/production.rb
5@@ -66,10 +66,10 @@ Gitlab::Application.configure do
6
7 config.action_mailer.delivery_method = :sendmail
8 # Defaults to:
9- # # config.action_mailer.sendmail_settings = {
10- # # location: '/usr/sbin/sendmail',
11- # # arguments: '-i -t'
12- # # }
13+ config.action_mailer.sendmail_settings = {
14+ location: '/var/setuid-wrappers/sendmail',
15+ arguments: '-i -t'
16+ }
17 config.action_mailer.perform_deliveries = true
18 config.action_mailer.raise_delivery_errors = true
19
20diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
21index e7a8d08..834ecaf 100644
22--- a/config/gitlab.yml.example
23+++ b/config/gitlab.yml.example
24@@ -17,8 +17,8 @@ production: &base
25 ## GitLab settings
26 gitlab:
27 ## Web server settings (note: host is the FQDN, do not include http://)
28- host: localhost
29- port: 80 # Set to 443 if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
30+ host: <%= ENV['GITLAB_HOST'] || 'localhost' %>
31+ port: <%= ENV['GITLAB_PORT'] || 80 %>
32 https: false # Set to true if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
33
34 # Uncommment this line below if your ssh host is different from HTTP/HTTPS one
35@@ -31,11 +31,11 @@ production: &base
36 # relative_url_root: /gitlab
37
38 # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
39- # user: git
40+ user: gitlab
41
42 ## Email settings
43 # Email address used in the "From" field in mails sent by GitLab
44- email_from: example@example.com
45+ email_from: <%= ENV['GITLAB_EMAIL_FROM'] %>
46
47 # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample).
48
49@@ -230,12 +230,12 @@ production: &base
50 # GitLab Satellites
51 satellites:
52 # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
53- path: /home/git/gitlab-satellites/
54+ path: <%= ENV['GITLAB_SATELLITES_PATH'] %>
55 timeout: 30
56
57 ## Backup settings
58 backup:
59- path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/)
60+ path: <%= ENV['GITLAB_BACKUP_PATH'] %>
61 # keep_time: 604800 # default: 0 (forever) (in seconds)
62 # upload:
63 # # Fog storage connection settings, see http://fog.io/storage/ .
64@@ -249,11 +249,11 @@ production: &base
65
66 ## GitLab Shell settings
67 gitlab_shell:
68- path: /home/git/gitlab-shell/
69+ path: <%= ENV['GITLAB_SHELL_PATH'] %>
70
71 # REPOS_PATH MUST NOT BE A SYMLINK!!!
72- repos_path: /home/git/repositories/
73- hooks_path: /home/git/gitlab-shell/hooks/
74+ repos_path: <%= ENV['GITLAB_REPOSITORIES_PATH'] %>
75+ hooks_path: <%= ENV['GITLAB_SHELL_HOOKS_PATH'] %>
76
77 # Git over HTTP
78 upload_pack: true
79@@ -266,7 +266,7 @@ production: &base
80 # CAUTION!
81 # Use the default values unless you really know what you are doing
82 git:
83- bin_path: /usr/bin/git
84+ bin_path: git
85 # The next value is the maximum memory size grit can use
86 # Given in number of bytes per git object (e.g. a commit)
87 # This value can be increased if you have very large commits
88@@ -299,7 +299,7 @@ test:
89 gravatar:
90 enabled: true
91 gitlab:
92- host: localhost
93+ host: <%= ENV['GITLAB_HOST'] %>
94 port: 80
95
96 # When you run tests we clone and setup gitlab-shell
97diff --git a/lib/gitlab/app_logger.rb b/lib/gitlab/app_logger.rb
98index 8e4717b..abfe2e4 100644
99--- a/lib/gitlab/app_logger.rb
100+++ b/lib/gitlab/app_logger.rb
101@@ -1,7 +1,7 @@
102 module Gitlab
103 class AppLogger < Gitlab::Logger
104 def self.file_name
105- 'application.log'
106+ ENV["GITLAB_APPLICATION_LOG_PATH"]
107 end
108
109 def format_message(severity, timestamp, progname, msg)