Merge branch 'master' into gitlab.com

Makefile

@@ -27,10 +27,7 @@ move_to_platform_dir:
 	mkdir pkg
 	mv ${PLATFORM_DIR} pkg/
-sync: remove_json move_to_secret_dir md5 s3_sync
-
-remove_json:
-	find pkg/ -name '*.json' -delete
+sync: move_to_secret_dir md5 s3_sync
 move_to_secret_dir:
 	if support/is_gitlab_ee.sh || support/is_gitlab_com.sh ; then \
@@ -40,7 +37,7 @@ move_to_secret_dir:
 	  ; fi
 md5:
-	find pkg -type f -exec md5sum {} \; -exec sha256sum {} \;
+	find pkg -name '*.json' -exec cat {} \;
 s3_sync:
 	aws s3 sync pkg/ s3://${RELEASE_BUCKET} --acl public-read --region ${RELEASE_BUCKET_REGION}

README.md

@@ -450,11 +450,9 @@ sudo /opt/gitlab/bin/gitlab-rails console
 This will only work after you have run `gitlab-ctl reconfigure` at least once.
-## Using a non-packaged database management server
-If you do not want to use the built-in Postgres
-server of omnibus-gitlab or if you want to use MySQL (GitLab Enterprise Edition
-only) you can do so as follows.
+## Using a MySQL database management server (Enterprise Edition only)
+If you want to use MySQL and are using the **GitLab Enterprise Edition packages** please do the following:
 Important note: if you are connecting omnibus-gitlab to an existing GitLab
 database you should create a backup before attempting this procedure.
@@ -482,10 +480,8 @@ gitlab_rails['db_username'] = 'git'
 gitlab_rails['db_password'] = 'password'
 ```
-Parameters such as `db_adapter` correspond to `adapter` in `database.yml`; see
-the upstream GitLab examples for [Postgres][database.yml.postgresql] and
-[MySQL][database.yml.mysql].  We remind you that `/etc/gitlab/gitlab.rb` should
-have file permissions `0600` because it contains plaintext passwords.
+Parameters such as `db_adapter` correspond to `adapter` in `database.yml`; see the upstream GitLab for a [MySQL configuration example][database.yml.mysql].
+We remind you that `/etc/gitlab/gitlab.rb` should have file permissions `0600` because it contains plaintext passwords.
 Run `sudo gitlab-ctl reconfigure` for the change to take effect.
@@ -500,6 +496,12 @@ sudo gitlab-rake gitlab:setup
 This is a destructive command; do not run it on an existing database!
+## Using a non-packaged PostgreSQL database management server
+
+If you do do not want to use the packaged Postgres server you can configure an external one similar to configuring a MySQL server (shown above).
+Configuring a PostgreSQL server is possible both with GitLab Community Edition and Enterprise Edition packages.
+Please see the upstream GitLab for a [PostgreSQL configuration example][database.yml.postgresql].
+
 ## Building your own package
 See [the separate build documentation](doc/build.md).

files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb

@@ -3,4 +3,4 @@
 cd <%= node['gitlab']['gitlab-rails']['dir'] %>/working
 exec 2>&1
-exec chpst -P -U <%= node['gitlab']['user']['username'] %> -u <%= node['gitlab']['user']['username'] %> /usr/bin/env BUNDLE_GEMFILE=/opt/gitlab/embedded/service/gitlab-rails/Gemfile HOME="<%= node['gitlab']['user']['home'] %>" /opt/gitlab/embedded/bin/bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e <%= node['gitlab']['gitlab-rails']['environment'] %> -r /opt/gitlab/embedded/service/gitlab-rails
+exec chpst -P -U <%= node['gitlab']['user']['username'] %> -u <%= node['gitlab']['user']['username'] %> /usr/bin/env BUNDLE_GEMFILE=/opt/gitlab/embedded/service/gitlab-rails/Gemfile HOME="<%= node['gitlab']['user']['home'] %>" /opt/gitlab/embedded/bin/bundle exec sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e <%= node['gitlab']['gitlab-rails']['environment'] %> -r /opt/gitlab/embedded/service/gitlab-rails