From 2ffb235a4a5523157c3e5c61404ea0f78d2bebe4 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 19 Nov 2014 23:15:05 +0530 Subject: [PATCH] init: added `NGINX_WORKERS` configuration option, refer #166 --- Changelog.md | 1 + README.md | 1 + assets/init | 2 ++ 3 files changed, 4 insertions(+) diff --git a/Changelog.md b/Changelog.md index d9aed083..ecb4f427 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,7 @@ **latest** - added `SSL_VERIFY_CLIENT` configuration option +- added `NGINX_WORKERS` configuration option **7.4.3** - gitlab: upgrade to CE v.7.4.3 diff --git a/README.md b/README.md index 5dee75e7..8ab3aac7 100644 --- a/README.md +++ b/README.md @@ -702,6 +702,7 @@ Below is the complete list of available options that can be used to customize yo - **SSL_DHPARAM_PATH**: Location of the dhparam file. Defaults to `/home/git/data/certs/dhparam.pem` - **SSL_VERIFY_CLIENT**: Enable verification of client certificates using the `CA_CERTIFICATES_PATH` file. Defaults to `false` - **CA_CERTIFICATES_PATH**: List of SSL certificates to trust. Defaults to `/home/git/data/certs/ca.crt`. +- **NGINX_WORKERS**: The number of nginx workers to start. Defaults to `1`. - **NGINX_MAX_UPLOAD_SIZE**: Maximum acceptable upload size. Defaults to `20m`. - **NGINX_X_FORWARDED_PROTO**: Advanced configuration option for the `proxy_set_header X-Forwarded-Proto` setting in the gitlab nginx vHost configuration. Defaults to `https` when `GITLAB_HTTPS` is `true`, else defaults to `$scheme`. - **REDIS_HOST**: The hostname of the redis server. Defaults to `localhost` diff --git a/assets/init b/assets/init index 40a0178c..b0f2f5ae 100755 --- a/assets/init +++ b/assets/init @@ -39,6 +39,7 @@ CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-$GITLAB_DATA_DIR/certs/ca.crt} GITLAB_BACKUPS=${GITLAB_BACKUPS:-disable} GITLAB_BACKUP_EXPIRY=${GITLAB_BACKUP_EXPIRY:-} +NGINX_WORKERS=${NGINX_WORKERS:-1} NGINX_MAX_UPLOAD_SIZE=${NGINX_MAX_UPLOAD_SIZE:-20m} GITLAB_MAX_SIZE=$(echo $NGINX_MAX_UPLOAD_SIZE |sed -e "s/^ *\([0-9]*\)[mMkKgG] *$/\1/g" ) case "$NGINX_MAX_UPLOAD_SIZE" in @@ -545,6 +546,7 @@ else sed '/{{CA_CERTIFICATES_PATH}}/d' -i /etc/nginx/sites-enabled/gitlab fi +sed 's/worker_processes .*/worker_processes '"${NGINX_WORKERS}"';/' -i /etc/nginx/nginx.conf sed 's/{{NGINX_MAX_UPLOAD_SIZE}}/'"${NGINX_MAX_UPLOAD_SIZE}"'/' -i /etc/nginx/sites-enabled/gitlab sed 's/{{NGINX_X_FORWARDED_PROTO}}/'"${NGINX_X_FORWARDED_PROTO}"'/' -i /etc/nginx/sites-enabled/gitlab