Commit bc1dea09 authored by iv's avatar iv

gitlab: Sync upstream configs from omnibus-gitlab 8-9-stable 5eb2711e

    Like 5e227fdb - pristine copy from omnibus-gitlab 8-9-stable 5eb2711e

    Changes are:

        - gitlab.yml.erb
          Add cron gitlab.yml configuration.

        - nginx.conf.erb
          Make the server names nginx hash size configurable

        - smtp_settings.rb.erb
          Set ActionMailer::Base.delivery_method to SMTP to make mail work

    The following files stay the same:

        - database.yml.erb
        - gitconfig.erb
        - gitlab-shell-config.yml.erb
        - nginx-gitlab-http.conf.erb
        - rack_attack.rb.erb
        - resque.yml.erb
        - unicorn.rb.erb
parent 5e227fdb
...@@ -167,6 +167,16 @@ production: &base ...@@ -167,6 +167,16 @@ production: &base
# Flag stuck CI builds as failed # Flag stuck CI builds as failed
stuck_ci_builds_worker: stuck_ci_builds_worker:
cron: <%= @stuck_ci_builds_worker_cron %> cron: <%= @stuck_ci_builds_worker_cron %>
# Remove expired build artifacts
expire_build_artifacts_worker:
cron: <%= @expire_build_artifacts_worker_cron %>
# Periodically run 'git fsck' on all repositories. If started more than
# once per hour you will have concurrent 'git fsck' jobs.
repository_check_worker:
cron: <%= @repository_check_worker_cron %>
# Send admin emails once a week
admin_email_worker:
cron: <%= @admin_email_worker_cron %>
# Remove outdated repository archives # Remove outdated repository archives
repository_archive_cache_worker: repository_archive_cache_worker:
...@@ -404,8 +414,8 @@ production: &base ...@@ -404,8 +414,8 @@ production: &base
piwik_site_id: <%= single_quote(@extra_piwik_site_id) %> piwik_site_id: <%= single_quote(@extra_piwik_site_id) %>
<% end %> <% end %>
rack_attack: rack_attack:
git_basic_auth: <%= @rack_attack_git_basic_auth.to_json if @rack_attack_git_basic_auth %> git_basic_auth: <%= @rack_attack_git_basic_auth.to_json if @rack_attack_git_basic_auth %>
development: development:
......
...@@ -18,6 +18,8 @@ http { ...@@ -18,6 +18,8 @@ http {
log_format gitlab_ci_access '<%= @gitlab_ci_access_log_format %>'; log_format gitlab_ci_access '<%= @gitlab_ci_access_log_format %>';
log_format gitlab_mattermost_access '<%= @gitlab_mattermost_access_log_format %>'; log_format gitlab_mattermost_access '<%= @gitlab_mattermost_access_log_format %>';
server_names_hash_bucket_size <%= @server_names_hash_bucket_size %>;
sendfile <%= @sendfile %>; sendfile <%= @sendfile %>;
tcp_nopush <%= @tcp_nopush %>; tcp_nopush <%= @tcp_nopush %>;
tcp_nodelay <%= @tcp_nodelay %>; tcp_nodelay <%= @tcp_nodelay %>;
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
if Rails.env.production? if Rails.env.production?
Gitlab::Application.config.action_mailer.delivery_method = :smtp Gitlab::Application.config.action_mailer.delivery_method = :smtp
ActionMailer::Base.delivery_method = :smtp
ActionMailer::Base.smtp_settings = { ActionMailer::Base.smtp_settings = {
<% unless @smtp_authentication.nil? %> <% unless @smtp_authentication.nil? %>
authentication: <%= @smtp_authentication.to_s.to_sym.inspect %>, authentication: <%= @smtp_authentication.to_s.to_sym.inspect %>,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment