Version 0.7.3

Berksfile.lock

@@ -26,7 +26,7 @@ GRAPH
     mysql-chef_gem (>= 0.0.0)
     postgresql (>= 1.0.0)
     xfs (>= 0.0.0)
-  gitlab (0.7.2)
+  gitlab (0.7.3)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
     database (>= 0.0.0)

README.md

+# This cookbook is being deprecated in favor of [cookbook-omibus-gitlab](https://gitlab.com/gitlab-org/cookbook-omnibus-gitlab)
+and package installations
+
 GitLab Cookbook
 ===============
 Chef cookbook with recipes to install GitLab and its dependencies:
-* GitLab: 7.3.0
-* GitLab Shell: 2.0.0
+* GitLab: 7.3
+* GitLab Shell: 2.0.1
 * Ruby: 2.1.2
 * Redis: 2.6.13
 * Git: 2.0.0

attributes/default.rb

@@ -78,7 +78,7 @@ else
   default['gitlab']['url'] = "http://localhost:80/"
   default['gitlab']['port'] = "80"
   default['gitlab']['ssh_port'] = "22"
-  default['gitlab']['shell_revision'] = "v2.0.0"
+  default['gitlab']['shell_revision'] = "v2.0.1"
 end
 # Nginx ip

metadata.rb

 name             'gitlab'
 maintainer       'Marin Jankovski'
-maintainer_email 'marin@gitlab.com'
+maintainer_email 'maxlazio@gmail.com'
 license          'MIT'
 description      'Installs/Configures GitLab'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.7.2'
+version          '0.7.3'
 recipe "gitlab::default", "Installation"

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: "v2.0.0",
+          revision: "v2.0.1",
           user: 'git',
           group: 'git'
         )
@@ -64,7 +64,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: "v2.0.0",
+          revision: "v2.0.1",
           user: 'git',
           group: 'git'
         )

spec/gitlab_shell_install_spec.rb

@@ -25,7 +25,7 @@ describe "gitlab::gitlab_shell_install" do
             redis_port: "6379",
             redis_database: nil,
             redis_port: "0",
-            redis_unixsocket: "/var/lib/redis/redis.sock",
+            redis_unixsocket: "/var/run/redis/sockets/redis.sock",
             namespace: "resque:gitlab",
             self_signed_cert: false
           }
@@ -66,7 +66,7 @@ describe "gitlab::gitlab_shell_install" do
           runner.node.set['gitlab']['env'] = "production"
           runner.node.set['gitlab']['home'] = "/data/git"
           runner.node.set['gitlab']['redis_database'] = 2
-          runner.node.set['gitlab']['redis_unixsocket'] = "/var/lib/redis/redis.sock"
+          runner.node.set['gitlab']['redis_unixsocket'] = "/var/run/redis/sockets/redis.sock"
           runner.converge("gitlab::gitlab_shell_install")
         end
@@ -82,7 +82,7 @@ describe "gitlab::gitlab_shell_install" do
               redis_host: "127.0.0.1",
               redis_port: "0",
               redis_database: 2,
-              redis_unixsocket: "/var/lib/redis/redis.sock",
+              redis_unixsocket: "/var/run/redis/sockets/redis.sock",
               namespace: "resque:gitlab",
               self_signed_cert: false
             }
@@ -110,7 +110,7 @@ describe "gitlab::gitlab_shell_install" do
         runner = ChefSpec::Runner.new(platform: "centos", version: version)
         runner.node.set['gitlab']['env'] = "production"
         runner.node.set['gitlab']['redis_database'] = 3
-        runner.node.set['gitlab']['redis_unixsocket'] = "/var/lib/redis/redis.sock"
+        runner.node.set['gitlab']['redis_unixsocket'] = "/var/run/redis/sockets/redis.sock"
         runner.converge("gitlab::gitlab_shell_install")
       end
@@ -126,7 +126,7 @@ describe "gitlab::gitlab_shell_install" do
             redis_host: "127.0.0.1",
             redis_port: "0",
             redis_database: 3,
-            redis_unixsocket: "/var/lib/redis/redis.sock",
+            redis_unixsocket: "/var/run/redis/sockets/redis.sock",
             namespace: "resque:gitlab",
             self_signed_cert: false
           }
@@ -182,7 +182,7 @@ describe "gitlab::gitlab_shell_install" do
               redis_port: "6379",
               redis_database: nil,
               redis_port: "0",
-              redis_unixsocket: "/var/lib/redis/redis.sock",
+              redis_unixsocket: "/var/run/redis/sockets/redis.sock",
               namespace: "resque:gitlab",
               self_signed_cert: false
             }

spec/packages_spec.rb

@@ -19,8 +19,6 @@ describe "gitlab::packages" do
         expect(chef_run).to include_recipe("apt::default")
         expect(chef_run).to_not include_recipe("yum::epel")
         expect(chef_run).to include_recipe("gitlab::git")
-        expect(chef_run).to include_recipe("redisio::install")
-        expect(chef_run).to include_recipe("redisio::enable")
       end
       it "installs all default packages" do
@@ -51,8 +49,6 @@ describe "gitlab::packages" do
         expect(chef_run).to_not include_recipe("apt::default")
         expect(chef_run).to include_recipe("yum-epel::default")
         expect(chef_run).to include_recipe("gitlab::git")
-        expect(chef_run).to include_recipe("redisio::install")
-        expect(chef_run).to include_recipe("redisio::enable")
       end
       it "installs all default packages" do