Commit b6022ed7 authored by iv's avatar iv

gitlab: Merge in upstream config updates

    This does almost only pure merge. We will slaposify / adjust config
    and corresponding md5sum in the following patches.

Conflicts:
	software/gitlab/template/gitlab.yml.in
	software/gitlab/template/nginx.conf.in
parents d14dc814 bc1dea09
...@@ -198,6 +198,16 @@ production: &base ...@@ -198,6 +198,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:
......
...@@ -27,6 +27,8 @@ http { ...@@ -27,6 +27,8 @@ http {
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 {{ cfg('nginx_sendfile') }}; sendfile {{ cfg('nginx_sendfile') }};
tcp_nopush {{ cfg('nginx_tcp_nopush') }}; tcp_nopush {{ cfg('nginx_tcp_nopush') }};
tcp_nodelay {{ cfg('nginx_tcp_nodelay') }}; tcp_nodelay {{ cfg('nginx_tcp_nodelay') }};
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,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 = {
address: "{{ cfg('smtp_address') }}", address: "{{ cfg('smtp_address') }}",
port: {{ cfg('smtp_port') }}, port: {{ cfg('smtp_port') }},
......
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