Merge branch 'master' of gitlab.com:gitlab-org/omnibus-gitlab into 6-6-stable-ee

README.md

 # GitLab Omnibus project
-This project creates full-stack platform-specific packages for
-GitLab. You can download omnibus-gitlab packages [here][downloads].
-For other installation options, see the
-[main project README][CE README].
+This project creates full-stack platform-specific [downloadable packages for GitLab][downloads].
+For other installation options please see the
+[GitLab project README][CE README].
 ## Installation

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -86,6 +86,8 @@ default['gitlab']['gitlab-rails']['ldap_method'] = "ssl"
 default['gitlab']['gitlab-rails']['ldap_bind_dn'] = "_the_full_dn_of_the_user_you_will_bind_with"
 default['gitlab']['gitlab-rails']['ldap_password'] = "_the_password_of_the_bind_user"
 default['gitlab']['gitlab-rails']['ldap_allow_username_or_email_login'] = true
+default['gitlab']['gitlab-rails']['ldap_user_filter'] = ""
+default['gitlab']['gitlab-rails']['ldap_group_base'] = ""
 default['gitlab']['gitlab-rails']['satellites_path'] = "/var/opt/gitlab/git-data/gitlab-satellites"
 default['gitlab']['gitlab-rails']['backup_path'] = "/var/opt/gitlab/backups"
 default['gitlab']['gitlab-rails']['gitlab_shell_path'] = "/opt/gitlab/embedded/service/gitlab-shell/"

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -142,6 +142,19 @@ production: &base
     # disable this setting, because the userPrincipalName contains an '@'.
     allow_username_or_email_login: <%= @ldap_allow_username_or_email_login %>
+    # Filter LDAP users
+    #
+    #   Format: RFC 4515
+    #   Ex. (employeeType=developer)
+    #
+    user_filter: '<%= @ldap_user_filter %>'
+
+    # Base where we can search for groups
+    #
+    #   Ex. ou=Groups,dc=gitlab,dc=example
+    #
+    group_base: '<%= @ldap_group_base %>'
+
   ## OmniAuth settings
   omniauth:
     # Allow login via Twitter, Google, etc. using OmniAuth providers

release.sh

@@ -34,12 +34,22 @@ if [[ -z ${release_package} ]]; then
   error_exit 'could not find the release package'
 fi
+if (git describe | grep -w ee); then
+  release_dir="$(openssl rand -hex 20)"
+  if [[ $? -ne 0 ]]; then
+    error_exit 'failed to generate release directory name'
+  fi
+  remote_package_path="s3://${RELEASE_BUCKET}/${release_dir}/${release_package#pkg/}"
+else
+  remote_package_path="s3://${RELEASE_BUCKET}/${release_package#pkg/}"
+fi
+
 echo
 echo 'Package MD5:'
 md5sum ${release_package}
 echo
 echo 'Starting upload'
-if !(aws s3 cp ${release_package} s3://${RELEASE_BUCKET} --acl public-read --region ${RELEASE_BUCKET_REGION}); then
+if !(aws s3 cp ${release_package} ${remote_package_path} --acl public-read --region ${RELEASE_BUCKET_REGION}); then
   error_exit 'release upload failed'
 fi