Up to 6.7

gitlab/README.md

@@ -3,13 +3,13 @@ GitLab Cookbook
 Chef cookbook with recipes to install GitLab and its dependencies:
-* GitLab: 6.5
-* GitLab Shell: 1.8.0
-* Ruby: 2.0.0p353
+* GitLab: 6.7
+* GitLab Shell: 1.9.1
+* Ruby: 2.1.1
 * Redis: 2.6.13
 * Git: 1.8.4.1
 * Nginx: 1.1.19
-* PostgreSQL: 9.1.9
+* PostgreSQL: 9.3
 * MySQL: 5.5.34
 ### Compatible operating systems
@@ -63,7 +63,7 @@ NOTE: Must be used in combination with `gitlab::setup` recipe.
 ### gems
-This recipe decides what will be included and what will be ommited from the bundle install command and then it runs the bundle install.
+This recipe decides what will be included and what will be omitted from the bundle install command and then it runs the bundle install.
 Inclusion or exclusion is decided based on the database selected and environment, using attributes in `attributes/default.rb`
 ### git
@@ -76,21 +76,26 @@ Clones the gitlab-shell repository. Recipe uses the attributes in `attributes/de
 `attributes/development.rb` or `attributes/production.rb`.
 ### gitlab_shell_install
+
 Creates a gitlab-shell config.yml from attributes in `attributes/default.rb` and, depending on the environment set,
 `attributes/development.rb` or `attributes/production.rb`. Runs `gitlab-shell` install script and install it.
 ### install
+
 Creates a gitlab config.yml, database.yml from attributes in `attributes/default.rb` and, depending on the environment set,
 `attributes/development.rb` or `attributes/production.rb`. Creates GitLab required directories and sets permissions. Copies the example files
 to their locations. Runs `db:setup`, `db:migrate`, `db:seed_fu` to prepare selected database for GitLab.
 ### nginx
+
 Installs and configures nginx for usage.
 ### packages
+
 Installs all GitLab dependency packages supplied in `attributes/default.rb`.
 ### ruby
+
 Compiles ruby from source based on attributes in `attributes/default.rb`.
 ### setup

gitlab/attributes/default.rb

@@ -14,11 +14,10 @@ else
 end
 default['gitlab']['packages'] = packages
-default['gitlab']['ruby'] = "2.0.0-p353"
+default['gitlab']['ruby'] = "2.1.1"
 # GitLab shell
 default['gitlab']['shell_repository'] = "https://github.com/gitlabhq/gitlab-shell.git"
-default['gitlab']['shell_revision'] = "v1.8.0"
 # GitLab shell configuration
 default['gitlab']['repos_path'] = "/home/git/repositories"
@@ -40,12 +39,14 @@ if node['gitlab']['env'] == "development"
   default['gitlab']['url'] = "http://localhost:3000/"
   default['gitlab']['port'] = "3000"
   default['gitlab']['ssh_port'] = "2222"
+  default['gitlab']['shell_revision'] = "master"
 else
   default['gitlab']['environments'] = %w{production}
-  default['gitlab']['revision'] = "6-6-stable" # Must be branch, otherwise GitLab update will run on each chef run
+  default['gitlab']['revision'] = "6-7-stable" # Must be branch, otherwise GitLab update will run on each chef run
   default['gitlab']['url'] = "http://localhost:80/"
   default['gitlab']['port'] = "80"
   default['gitlab']['ssh_port'] = "22"
+  default['gitlab']['shell_revision'] = "v1.9.1"
 end
 # GitLab configuration

gitlab/attributes/git.rb

 # Git
 default['gitlab']['git']['prefix'] = "/usr/local"
 default['gitlab']['git']['version'] = "1.8.4.1"
-default['gitlab']['git']['url'] = "https://github.com/git/git/archive/v#{node['gitlab']['git']['version']}.zip"
+default['gitlab']['git']['url'] = "https://codeload.github.com/git/git/zip/v#{node['gitlab']['git']['version']}"
 if platform_family?("rhel")
   packages = %w{expat-devel gettext-devel libcurl-devel openssl-devel perl-ExtUtils-MakeMaker zlib-devel}
@@ -9,4 +9,4 @@ else
   packages = %w{unzip build-essential libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev}
 end
-default['gitlab']['git']['packages'] = packages
+default['gitlab']['git']['packages'] = packages
\ No newline at end of file

gitlab/doc/aws_vagrant.md

@@ -20,18 +20,15 @@ vagrant box add dummy https://github.com/mitchellh/vagrant-aws/raw/master/dummy.
 git clone https://gitlab.com/gitlab-org/cookbook-gitlab.git ./gitlab
 cd ./gitlab/
 cp ./example/Vagrantfile_aws ./Vagrantfile
+editor ./Vagrantfile
 ```
 Fill in the AWS credentials under the aws section in Vagrantfile and then run:
 ```bash
-vagrant up --provider=aws --provision
-```
-
-HostName setting:
-
-```bash
-vagrant ssh-config | awk '/HostName/ {print $2}'
-editor ./Vagrantfile
+vagrant up --provider=aws
+eval $(vagrant ssh-config | awk '/HostName/ {print "HostName=" $2}')
+sed -i.bak "s/example.com/$HostName/g" Vagrantfile
+sed -i.bak 's/chef.run_list = \[\]/chef.run_list = \["gitlab::default"\]/g' Vagrantfile
 vagrant provision
 ```

gitlab/doc/development.md

@@ -4,14 +4,14 @@
 * [Ruby 1.9 or higher](https://www.ruby-lang.org/) and [Rubygems](http://rubygems.org/)
 * [VirtualBox](https://www.virtualbox.org)
-* [Vagrant 1.3.x](http://vagrantup.com)
+* [Vagrant 1.3.5](http://vagrantup.com)
 * The NFS packages for the synced folder of Vagrant. These are already installed if you are using Mac OSX and not necessary if you are using Windows. On Linux install them by running:
 ```bash
 sudo apt-get install nfs-kernel-server nfs-common portmap
 ```
-Make sure to use Vagrant v1.3.x. Do not install Vagrant via rubygems.org as there exists an old gem which will probably cause errors. Instead, go to [Vagrant download page](http://downloads.vagrantup.com/) and install a version ~> `1.3.0`.
+Make sure to use Vagrant v1.3.5. Do not install Vagrant via rubygems.org as there exists an old gem which will probably cause errors. Instead, go to [Vagrant download page](http://downloads.vagrantup.com/) and install version `1.3.5`.
 On OS X you can also choose to use [the (commercial) Vagrant VMware Fusion plugin](http://www.vagrantup.com/vmware) instead of VirtualBox.

gitlab/doc/development_metal.md

@@ -82,9 +82,20 @@ First make sure that your username on the dedicated OS is the same as the userna
 Next, mount your existing OS's home directory on your dedicated OS's home by adding a line like the following line to your `/etc/fstab`:
-    UUID=<existing_os_uuid> /home/<existing_username>    ext4    defaults    0    0
-where you can find the `existing_os_uuid` via `sudo blkid` and `sudo lsblk -f`.
+```bash
+UUID=
+echo "UUID=$UUID /media/home   ext4    defaults    0    0" | sudo tee -a /etc/fstab
+```
+
+where you can find `UUID` via `sudo blkid` and `sudo lsblk -f`.
+Get the home directory out of the way and symlink into the main system's home:
+
+```bash
+cd /home
+sudo mv "$USER" "$USER".bak
+sudo ln -s /media/home/home/"$USER" "$USER"
+```
 To be able to edit the Gitlab files easily, use `bindfs` to bind the Gitlab folder to your home directory under a different username.
@@ -92,14 +103,27 @@ To do that automatically on every startup on Ubuntu use the following:
 ```bash
 sudo apt-get install bindfs
-sudo tee /etc/init/bindfs-gitlab.conf << EOF
 mkdir -p ~/gitlab
-description	"Bindfs mount gitlab for development user."
-start on stopping mountall
+#mkdir -p ~/gitlab-shell
+#mkdir -p ~/repositories
+#mkdir -p ~/gitlab-ci
+#mkdir -p ~/gitlab-satellites
+#mkdir -p ~/gitlab-ci-runner
+
+sudo tee /etc/init/bindfs-gitlab.conf << EOF
+description "Bindfs mount gitlab for development user."
+# Can only mount when mountall has mounted the home from the main system.
+start on stopped mountall
 script
-    bindfs -u $USER -g $USER --create-for-user=git --create-for-group=git /home/git/gitlab /home/$USER/gitlab
+  bindfs -u ciro -g ciro --create-for-user=git --create-for-group=git /home/git/gitlab /home/ciro/gitlab
+  # Uncomment as needed:
+  #bindfs -u ciro -g ciro --create-for-user=git --create-for-group=git /home/git/gitlab-satellites /home/ciro/gitlab-satellites
+  #bindfs -u ciro -g ciro --create-for-user=git --create-for-group=git /home/git/repositories /home/ciro/repositories
+  #bindfs -u ciro -g ciro --create-for-user=git --create-for-group=git /home/git/gitlab-shell /home/ciro/gitlab-shell
+  #bindfs -u ciro -g ciro --create-for-user=gitlab_ci --create-for-group=gitlab_ci /home/gitlab_ci/gitlab-ci /home/ciro/gitlab-ci
+  #bindfs -u ciro -g ciro --create-for-user=gitlab_ci_runner --create-for-group=gitlab_ci_runner /home/gitlab_ci_runner/gitlab-ci-runner /home/ciro/gitlab-ci-runner
 end script
 EOF
 ```

gitlab/doc/knife_solo.md

+### Production installation with Knife Solo
+
+This guide details installing a GitLab server with Knife Solo.
+
+### Requirements
+
+[knife-solo](http://matschaffer.github.io/knife-solo/)
+
+### Installation
+
+Create chef directory:
+
+```bash
+$ gem install berkshelf
+$ gem install knife-solo
+$ knife configure
+$ knife solo init ./gitlab_chef
+$ cd ./gitlab_chef/
+```
+
+Install cookbooks:
+
+```bash
+$ curl -o Berksfile https://gitlab.com/gitlab-org/cookbook-gitlab/raw/master/Berksfile
+$ sed -i.bak '/^metadata$/d' Berksfile
+$ echo "cookbook 'gitlab', git: 'https://gitlab.com/gitlab-org/cookbook-gitlab.git'" >> Berksfile
+$ berks install --path ./cookbooks
+```
+
+SSH config setting:
+
+```
+$ cat << __EOS__ >> ~/.ssh/config
+Host vagrant
+  Hostname 127.0.0.1
+  Port 2222
+  User vagrant
+  IdentityFile ~/.vagrant.d/insecure_private_key
+__EOS__
+```
+
+Node setting:
+
+```
+$ cat << __EOS__ > ./nodes/vagrant.json
+{
+  "gitlab": {
+    "host": "localhost",
+    "url": "http://localhost:80/"
+  },
+  "run_list": [
+    "gitlab::default"
+  ]
+}
+__EOS__
+```
+
+Install GitLab server:
+
+```
+$ knife solo prepare vagrant --bootstrap-version 11.4.4
+$ knife solo cook vagrant
+```
+
+For more information on how to run the application, the tests and more please see the [Development installation on a virtual machine](doc/development.md).

gitlab/doc/open_LDAP.md

-Gitlab-Vagrant-VM OpenLDAP setup
-=================
-Description
------------
+### Gitlab-Vagrant-VM OpenLDAP setup
+#### Description
 This guide will help you setup OpenLDAP in case you need an LDAP server in your dev environment for GitLab.
 The reason why OpenLDAP is not installed by default in GitLab-Vagrant-VM is that it would extend the time needed for creating the dev box and not everyone needs LDAP.
 However, it would be great if somebody could add this as a recipe to the Chef cookbook so it is installed automatically.
 # Important notes
+
 This guide is very basic and any improvements are welcome!
 **Note:**
@@ -20,8 +19,8 @@ If you are not familiar with vim please skip this and keep using the default edi
     sudo apt-get install -y vim
     sudo update-alternatives --set editor /usr/bin/vim.basic
-Setup
------------
+#### Setup
+
 Login to your Vagrant machine
 ```bash

gitlab/doc/release/monthly.md

+# Things to do when creating new monthly minor or major cookbook release
+
+NOTE: This is a guide for GitLab developers.
+
+## Check the official guides
+
+Check the [install guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) and the [update guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/patch_versions.md) for any minor/major changes.
+
+## Check for differences in template files
+
+Diff between TEMPLATE and CONFIG in main GitLab repository
+
+1. templates/gitlab.yml.erb and config/gitlab.yml.example
+1. templates/nginx.erb and lib/support/nginx/gitlab
+1. templates/unicorn.rb.erb and config/unicorn.rb.example
+1. templates/database.yml.(postgresql | mysql).erb and config/database.yml.(postgresql | mysql)
+
+## Change revision
+
+In  [default attributes](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/attributes/default.rb#L45) change the revision for production environment
+
+## Fix any failing tests
+
+Most of the time only tests that need fixing are in [clone spec](spec/clone_spec.rb)
+
+## Change the version of the cookbook
+
+Replace the version in [metadata](metadata.rb) with the new version.
+Example: If released GitLab version is 6.7, cookbook version is 0.6.7
+
+## Running the cookbook in different environments
+
+Provision a GitLab instance by using the cookbook in supported environments:
+
+1. Ubuntu 12.04
+1. CentOS 6.5
+1. AWS OpsWorks
+1. Vagrant (development)
+
+After provisioning, login to each instance and *at least* create a repository and push to GitLab.

gitlab/example/Vagrantfile_aws

@@ -19,35 +19,14 @@ Vagrant.configure("2") do |config|
     override.ssh.private_key_path = "~/.ssh/vagrant_aws.pem"
   end
-  config.omnibus.chef_version = :latest
+  config.omnibus.chef_version = "11.4.4"
   config.berkshelf.enabled = true
   config.vm.provision :chef_solo do |chef|
     chef.json = {
-      :postfix => {
-        :mail_type => "client",
-        :myhostname => "mail.example.com",
-        :mydomain => "example.com",
-        :myorigin => "mail.example.com",
-        :smtp_use_tls => "no"
-      },
-      :postgresql => {
-        :password => {
-          :postgres => "psqlpass"
-        }
-      },
-      :mysql => {
-        :server_root_password => "rootpass",
-        :server_repl_password => "replpass",
-        :server_debian_password => "debianpass"
-      },
       :gitlab => {
         :host => "example.com",
-        :url => "http://example.com/",
-        :email_from => "gitlab@example.com",
-        :support_email => "support@example.com",
-        :database_adapter => "postgresql",
-        :database_password => "datapass"
+        :url => "http://example.com/"
       }
     }
     chef.run_list = []

gitlab/metadata.rb

@@ -4,7 +4,7 @@ maintainer_email 'marin@gitlab.com'
 license          'MIT'
 description      'Installs/Configures GitLab'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.6.6'
+version          '0.6.7'
 recipe "gitlab::default", "Installation"

gitlab/recipes/database_mysql.rb

@@ -15,7 +15,8 @@ end
 mysql_connection = {
   :host => mysql['server_host'],
   :username => mysql['server_root_username'],
-  :password => mysql['server_root_password']
+  :password => mysql['server_root_password'],
+  :socket => mysql['server']['socket']
 }
 ## Create a user for GitLab.

gitlab/recipes/install.rb

@@ -118,7 +118,8 @@ template File.join(gitlab['path'], "config", "database.yml") do
   variables({
     :user => gitlab['database_user'],
     :password => gitlab['database_password'],
-    :host => node[gitlab['database_adapter']]['server_host']
+    :host => node[gitlab['database_adapter']]['server_host'],
+    :socket => gitlab['database_adapter'] == "mysql" ? node['mysql']['server']['socket'] : nil
   })
   notifies :reload, "service[gitlab]"
 end

gitlab/spec/clone_spec.rb

@@ -15,7 +15,7 @@ describe "gitlab::clone" do
       it "clones the gitlab repository" do
         expect(chef_run).to sync_git('/home/git/gitlab').with(
           repository: 'https://github.com/gitlabhq/gitlabhq.git',
-          revision: '6-6-stable',
+          revision: '6-7-stable',
           user: 'git',
           group: 'git'
         )
@@ -51,7 +51,7 @@ describe "gitlab::clone" do
       it "clones the gitlab repository" do
         expect(chef_run).to sync_git('/home/git/gitlab').with(
           repository: 'https://github.com/gitlabhq/gitlabhq.git',
-          revision: '6-6-stable',
+          revision: '6-7-stable',
           user: 'git',
           group: 'git'
         )

gitlab/spec/git_spec.rb

@@ -25,7 +25,7 @@ describe "gitlab::git" do
       end
       it 'gets the source code for git' do
-        expect(chef_run).to create_remote_file("#{Chef::Config['file_cache_path']}/git-1.8.4.1.zip").with(mode: 0644, source: "https://github.com/git/git/archive/v1.8.4.1.zip")
+        expect(chef_run).to create_remote_file("#{Chef::Config['file_cache_path']}/git-1.8.4.1.zip").with(mode: 0644, source: "https://codeload.github.com/git/git/zip/v1.8.4.1")
       end
       it 'executes compiling git from source' do
@@ -57,7 +57,7 @@ describe "gitlab::git" do
       end
       it 'gets the source code for git' do
-        expect(chef_run).to create_remote_file("#{Chef::Config['file_cache_path']}/git-1.8.4.1.zip").with(mode: 0644, source: "https://github.com/git/git/archive/v1.8.4.1.zip")
+        expect(chef_run).to create_remote_file("#{Chef::Config['file_cache_path']}/git-1.8.4.1.zip").with(mode: 0644, source: "https://codeload.github.com/git/git/zip/v1.8.4.1")
       end
       it 'executes compiling git from source' do

gitlab/spec/gitlab_shell_clone_spec.rb

@@ -15,7 +15,7 @@ describe "gitlab::gitlab_shell_clone" do
       it "clones the gitlab-shell repository" do
         expect(chef_run).to sync_git('/home/git/gitlab-shell').with(
           repository: 'https://github.com/gitlabhq/gitlab-shell.git',
-          revision: "v1.8.0",
+          revision: "v1.9.1",
           user: 'git',
           group: 'git'
         )
@@ -31,7 +31,7 @@ describe "gitlab::gitlab_shell_clone" do
         it "clones the gitlab-shell repository" do
           expect(chef_run).to sync_git('/home/git/gitlab-shell').with(
             repository: 'https://github.com/gitlabhq/gitlab-shell.git',
-            revision: "v1.8.0",
+            revision: "master",
             user: 'git',
             group: 'git'
           )
@@ -51,7 +51,7 @@ describe "gitlab::gitlab_shell_clone" do
       it "clones the gitlab-shell repository" do
         expect(chef_run).to sync_git('/home/git/gitlab-shell').with(
           repository: 'https://github.com/gitlabhq/gitlab-shell.git',
-          revision: "v1.8.0",
+          revision: "v1.9.1",
           user: 'git',
           group: 'git'
         )
@@ -67,7 +67,7 @@ describe "gitlab::gitlab_shell_clone" do
         it "clones the gitlab-shell repository" do
           expect(chef_run).to sync_git('/home/git/gitlab-shell').with(
             repository: 'https://github.com/gitlabhq/gitlab-shell.git',
-            revision: "v1.8.0",
+            revision: "master",
             user: 'git',
             group: 'git'
           )

gitlab/spec/install_spec.rb

@@ -6,7 +6,7 @@ describe "gitlab::install" do
   describe "under ubuntu" do
     ["12.04", "10.04"].each do |version|
-      let(:chef_run) do 
+      let(:chef_run) do
         runner = ChefSpec::Runner.new(platform: "ubuntu", version: version)
         runner.node.set['gitlab']['env'] = "production"
         runner.converge("gitlab::start","gitlab::install")
@@ -111,7 +111,7 @@ describe "gitlab::install" do
       end
       describe "when using mysql" do
-        let(:chef_run) do 
+        let(:chef_run) do
           runner = ChefSpec::Runner.new(platform: "ubuntu", version: version)
           runner.node.set['gitlab']['env'] = "production"
           runner.node.set['gitlab']['database_adapter'] = "mysql"
@@ -127,14 +127,40 @@ describe "gitlab::install" do
             variables: {
               user: 'git',
               password: 'datapass',
-              host: "localhost"
+              host: "localhost",
+              socket: "/var/run/mysqld/mysqld.sock"
+            }
+          )
+        end
+      end
+
+      describe "when using mysql with custom server socket" do
+        let(:chef_run) do
+          runner = ChefSpec::Runner.new(platform: "ubuntu", version: version)
+          runner.node.set['gitlab']['env'] = "production"
+          runner.node.set['gitlab']['database_adapter'] = "mysql"
+          runner.node.set['gitlab']['database_password'] = "datapass"
+          runner.node.set['mysql']['server']['socket'] = "/tmp/mysql.sock"
+          runner.converge("gitlab::start","gitlab::install")
+        end
+
+        it 'creates a database config' do
+          expect(chef_run).to create_template('/home/git/gitlab/config/database.yml').with(
+            source: 'database.yml.mysql.erb',
+            user: 'git',
+            group: 'git',
+            variables: {
+              user: 'git',
+              password: 'datapass',
+              host: "localhost",
+              socket: "/tmp/mysql.sock"
             }
           )
         end
       end
       describe "when using postgresql" do
-        let(:chef_run) do 
+        let(:chef_run) do
           runner = ChefSpec::Runner.new(platform: "ubuntu", version: version)
           runner.node.set['gitlab']['env'] = "production"
           runner.node.set['gitlab']['database_adapter'] = "postgresql"
@@ -150,7 +176,8 @@ describe "gitlab::install" do
             variables: {
               user: 'git',
               password: 'datapass',
-              host: "localhost"
+              host: "localhost",
+              socket: nil
             }
           )
         end
@@ -195,7 +222,7 @@ describe "gitlab::install" do
       end
       describe "running database setup, migrations and seed when development" do
-        let(:chef_run) do 
+        let(:chef_run) do
           runner = ChefSpec::Runner.new(platform: "ubuntu", version: version)
           runner.node.set['gitlab']['env'] = "development"
           runner.converge("gitlab::start","gitlab::install")
@@ -258,7 +285,7 @@ describe "gitlab::install" do
         end
         describe "for development" do
-          let(:chef_run) do 
+          let(:chef_run) do
             runner = ChefSpec::Runner.new(platform: "ubuntu", version: version)
             runner.node.set['gitlab']['env'] = "development"
             runner.converge("gitlab::start","gitlab::install")
@@ -278,7 +305,7 @@ describe "gitlab::install" do
     describe "under centos" do
     ["5.8", "6.4"].each do |version|
-      let(:chef_run) do 
+      let(:chef_run) do
         runner = ChefSpec::Runner.new(platform: "centos", version: version)
         runner.node.set['gitlab']['env'] = "production"
         runner.converge("gitlab::start","gitlab::install")
@@ -385,11 +412,36 @@ describe "gitlab::install" do
       end
       describe "when using mysql" do
-        let(:chef_run) do 
+        let(:chef_run) do
+          runner = ChefSpec::Runner.new(platform: "centos", version: version)
+          runner.node.set['gitlab']['env'] = "production"
+          runner.node.set['gitlab']['database_adapter'] = "mysql"
+          runner.node.set['gitlab']['database_password'] = "datapass"
+          runner.converge("gitlab::start","gitlab::install")
+        end
+
+        it 'creates a database config' do
+          expect(chef_run).to create_template('/home/git/gitlab/config/database.yml').with(
+            source: 'database.yml.mysql.erb',
+            user: 'git',
+            group: 'git',
+            variables: {
+              user: 'git',
+              password: 'datapass',
+              host: "localhost",
+              socket: "/var/lib/mysql/mysql.sock"
+            }
+          )
+        end
+      end
+
+      describe "when using mysql with custom server socket" do
+        let(:chef_run) do
           runner = ChefSpec::Runner.new(platform: "centos", version: version)
           runner.node.set['gitlab']['env'] = "production"
           runner.node.set['gitlab']['database_adapter'] = "mysql"
           runner.node.set['gitlab']['database_password'] = "datapass"
+          runner.node.set['mysql']['server']['socket'] = "/tmp/mysql.sock"
           runner.converge("gitlab::start","gitlab::install")
         end
@@ -401,14 +453,15 @@ describe "gitlab::install" do
             variables: {
               user: 'git',
               password: 'datapass',
-              host: "localhost"
+              host: "localhost",
+              socket: "/tmp/mysql.sock"
             }
           )
         end
       end
       describe "when using postgresql" do
-        let(:chef_run) do 
+        let(:chef_run) do
           runner = ChefSpec::Runner.new(platform: "centos", version: version)
           runner.node.set['gitlab']['env'] = "production"
           runner.node.set['gitlab']['database_adapter'] = "postgresql"
@@ -424,7 +477,8 @@ describe "gitlab::install" do
             variables: {
               user: 'git',
               password: 'datapass',
-              host: "localhost"
+              host: "localhost",
+              socket: nil
             }
           )
         end
@@ -470,7 +524,7 @@ describe "gitlab::install" do
       end
       describe "running database setup, migrations and seed when development" do
-        let(:chef_run) do 
+        let(:chef_run) do
           runner = ChefSpec::Runner.new(platform: "centos", version: version)
           runner.node.set['gitlab']['env'] = "development"
           runner.converge("gitlab::start","gitlab::install")
@@ -534,7 +588,7 @@ describe "gitlab::install" do
         end
         describe "for development" do
-          let(:chef_run) do 
+          let(:chef_run) do
             runner = ChefSpec::Runner.new(platform: "centos", version: version)
             runner.node.set['gitlab']['env'] = "development"
             runner.converge("gitlab::start","gitlab::install")

gitlab/templates/default/database.yml.mysql.erb

@@ -7,10 +7,13 @@ production:
   reconnect: false
   database: gitlabhq_production
   pool: 10
+  reaping_frequency: 10
   username: "<%= @user %>"
   password: "<%= @password %>"
   host: <%= @host %>
-  # socket: /tmp/mysql.sock
+  <% if @socket %>
+  socket: <%= @socket %>
+  <% end %>
 #
 # Development specific
@@ -24,7 +27,9 @@ development:
   username: "<%= @user %>"
   password: "<%= @password %>"
   host: <%= @host %>
-  # socket: /tmp/mysql.sock
+  <% if @socket %>
+  socket: <%= @socket %>
+  <% end %>
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -38,4 +43,6 @@ test: &test
   username: "<%= @user %>"
   password: "<%= @password %>"
   host: <%= @host %>
-  # socket: /tmp/mysql.sock
+  <% if @socket %>
+  socket: <%= @socket %>
+  <% end %>

gitlab/templates/default/database.yml.postgresql.erb

@@ -5,7 +5,7 @@ production:
   adapter: postgresql
   encoding: unicode
   database: gitlabhq_production
-  pool: 5
+  pool: 10
   username: "<%= @user %>"
   password: "<%= @password %>"
   host: <%= @host %>

gitlab/templates/default/gitlab.yml.erb

@@ -117,11 +117,10 @@ production: &base
   ## LDAP settings
   # You can inspect a sample of the LDAP users with login access by running:
-  #   bundle exec rake gitlab:ldap:check[100] RAILS_ENV=production
+  #   bundle exec rake gitlab:ldap:check RAILS_ENV=production
   ldap:
     enabled: <%= @ldap_config["enabled"] %>
     host: '<%= @ldap_config["host"] %>'
-    base: '<%= @ldap_config["base"] %>'
     port: <%= @ldap_config["port"] %>
     uid: '<%= @ldap_config["uid"] %>'
     method: '<%= @ldap_config["method"] %>' # "ssl" or "plain"
@@ -138,6 +137,20 @@ production: &base
     # disable this setting, because the userPrincipalName contains an '@'.
     allow_username_or_email_login: <%= @ldap_config["allow_username_or_email_login"] %>
+    # Base where we can search for users
+    #
+    #   Ex. ou=People,dc=gitlab,dc=example
+    #
+	base: '<%= @ldap_config["base"] %>'
+
+    # Filter LDAP users
+    #
+    #   Format: RFC 4515
+    #   Ex. (employeeType=developer)
+    #
+    user_filter: ''
+
+
   ## OmniAuth settings
   omniauth:
     # Allow login via Twitter, Google, etc. using OmniAuth providers
@@ -177,7 +190,7 @@ production: &base
   ## GitLab Shell settings
   gitlab_shell:
-    path: <%= @shell_path %>
+    path: <%= @shell_path %>/
     # REPOS_PATH MUST NOT BE A SYMLINK!!!
     repos_path: <%= @repos_path %>/
@@ -210,6 +223,10 @@ production: &base
     ## Google analytics. Uncomment if you want it
     <%= "google_analytics_id: '#{ @google_analytics_id }'" unless @google_analytics_id.empty? %>
+    ## Piwik analytics.
+    # piwik_url: '_your_piwik_url'
+    # piwik_site_id: '_your_piwik_site_id'
+
     ## Text under sign-in page (Markdown enabled)
     <%= "sign_in_text: |
           #{ @sign_in_text }" unless @sign_in_text.empty? %>
@@ -219,6 +236,11 @@ development:
 test:
   <<: *base
+  gravatar:
+    enabled: true
+  gitlab:
+    host: localhost
+    port: 80
   issues_tracker:
     redmine:
       title: "Redmine"