From 573bb068025e6a93f811300d91fbd6cb6067cb21 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sat, 22 Mar 2014 19:20:35 +0530 Subject: [PATCH] upgrade to gitlab-6.7.2 --- Changelog.md | 3 ++- README.md | 4 ++-- assets/setup/config.tar.bz2 | Bin 7704 -> 7782 bytes assets/setup/config/gitlabhq/gitlab.yml | 24 +++++++++++++++++++++++- assets/setup/config/nginx/gitlab | 4 ++-- assets/setup/install | 2 +- 6 files changed, 30 insertions(+), 7 deletions(-) diff --git a/Changelog.md b/Changelog.md index e8c4004f6..40fe2133f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,7 @@ # Changelog -**latest a.k.a HEAD** +**6.7.2** +- upgrade gitlab to 6.7.2 - upgrade gitlab-shell to 1.9.1 - reorganize repo - do not perform system upgrades (http://crosbymichael.com/dockerfile-best-practices-take-2.html) diff --git a/README.md b/README.md index c5b38d5c7..184e774a0 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Dockerfile to build a GitLab container image. ## Version -Current Version: 6.6.5 +Current Version: 6.7.2 # Hardware Requirements @@ -82,7 +82,7 @@ docker pull sameersbn/gitlab Since version 6.3.0, the image builds are being tagged. You can now pull a particular version of gitlab by specifying the version number. For example, ```bash -docker pull sameersbn/gitlab:6.6.5 +docker pull sameersbn/gitlab:6.7.2 ``` Alternately you can build the image yourself. diff --git a/assets/setup/config.tar.bz2 b/assets/setup/config.tar.bz2 index 3fdc132e9c3b4100b70c79d25d876481698227d8..d23a3809d0d6df9e0cc17b5d34e1d5010ec55ed1 100644 GIT binary patch literal 7782 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 literal 7704 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 SJ=6dX_`8xR!i0gMY(XHh=Zf|K diff --git a/assets/setup/config/gitlabhq/gitlab.yml b/assets/setup/config/gitlabhq/gitlab.yml index 30d3ebac0..5d6037d0b 100644 --- a/assets/setup/config/gitlabhq/gitlab.yml +++ b/assets/setup/config/gitlabhq/gitlab.yml @@ -121,7 +121,6 @@ production: &base ldap: enabled: false host: '_your_ldap_server' - base: '_the_base_where_you_search_for_users' port: 636 uid: 'sAMAccountName' method: 'ssl' # "tls" or "ssl" or "plain" @@ -138,6 +137,20 @@ production: &base # disable this setting, because the userPrincipalName contains an '@'. allow_username_or_email_login: true + # Base where we can search for users + # + # Ex. ou=People,dc=gitlab,dc=example + # + base: '' + + # Filter LDAP users + # + # Format: RFC 4515 + # Ex. (employeeType=developer) + # + user_filter: '' + + ## OmniAuth settings omniauth: # Allow login via Twitter, Google, etc. using OmniAuth providers @@ -217,6 +230,10 @@ production: &base ## Google analytics. Uncomment if you want it # google_analytics_id: '_your_tracking_id' + ## Piwik analytics. + # piwik_url: '_your_piwik_url' + # piwik_site_id: '_your_piwik_site_id' + ## Text under sign-in page (Markdown enabled) # sign_in_text: | # ![Company Logo](http://www.companydomain.com/logo.png) @@ -227,6 +244,11 @@ development: test: <<: *base + gravatar: + enabled: true + gitlab: + host: {{GITLAB_HOST}} + port: {{GITLAB_PORT}} issues_tracker: redmine: title: "Redmine" diff --git a/assets/setup/config/nginx/gitlab b/assets/setup/config/nginx/gitlab index e7c1c225c..7b1774bca 100644 --- a/assets/setup/config/nginx/gitlab +++ b/assets/setup/config/nginx/gitlab @@ -24,10 +24,10 @@ server { server_name {{YOUR_SERVER_FQDN}}; # e.g., server_name source.example.com; server_tokens off; # don't show the version number, a security best practice root /home/git/gitlab/public; - + # Increase this if you want to upload large attachments # Or if you want to accept large git objects over http - client_max_body_size 5m; + client_max_body_size 20m; # individual nginx logs for this gitlab vhost access_log /var/log/nginx/gitlab_access.log; diff --git a/assets/setup/install b/assets/setup/install index 42719e04b..c1f3ea7ff 100755 --- a/assets/setup/install +++ b/assets/setup/install @@ -22,7 +22,7 @@ sudo -u git -H ./bin/install # install gitlab sudo -u git -H mkdir -p /home/git/gitlab -wget "https://github.com/gitlabhq/gitlabhq/archive/v6.6.5.tar.gz" -O - | tar -zvxf - --strip=1 -C /home/git/gitlab/ +wget "https://github.com/gitlabhq/gitlabhq/archive/v6.7.2.tar.gz" -O - | tar -zvxf - --strip=1 -C /home/git/gitlab/ chown -R git:git /home/git/gitlab/ cd /home/git/gitlab