From a0afeff62bbd54b3915491c67012a5c69f35c933 Mon Sep 17 00:00:00 2001 From: Nikita Borzykh Date: Fri, 20 Sep 2013 17:40:57 +0400 Subject: [PATCH] Use bw cookbooks --- Cheffile | 48 ++++++---------- Cheffile.lock | 148 ++++++++++++++++++++------------------------------ 2 files changed, 75 insertions(+), 121 deletions(-) diff --git a/Cheffile b/Cheffile index dc8c403..8de2116 100644 --- a/Cheffile +++ b/Cheffile @@ -4,51 +4,35 @@ cookbook 'base', :path => 'inhouse-cookbooks/base' cookbook 'fake', :path => 'inhouse-cookbooks/fake' -cookbook "timezone", - :git => "git@github.com:express42-cookbooks/timezone.git" +cookbook "timezone", :path => 'bw-cookbooks/timezone' -cookbook "sysctl", - :git => "git@github.com:express42-cookbooks/sysctl.git" +cookbook "sysctl", :path => 'bw-cookbooks/sysctl' -cookbook "apt", - :git => "git@github.com:opscode-cookbooks/apt.git" +cookbook "apt", :path => 'bw-cookbooks/apt' -cookbook "ntp", - :git => "https://github.com/opscode-cookbooks/ntp.git" +cookbook "ntp", :path => 'bw-cookbooks/ntp' -cookbook "user", - :git => "https://github.com/fnichol/chef-user.git" +cookbook "user", :path => 'bw-cookbooks/user' -cookbook "sudo", - :git => "git@github.com:express42-cookbooks/sudo.git" +cookbook "sudo", :path => 'bw-cookbooks/sudo' -cookbook "lvm", - :git => "https://github.com/opscode-cookbooks/lvm.git" +cookbook "lvm", :path => 'bw-cookbooks/lvm' -cookbook "zabbix", - :git => "git@github.com:express42-cookbooks/zabbix.git" +cookbook "zabbix", :path => 'bw-cookbooks/zabbix' -cookbook "zabbix-server", - :git => "git@github.com:express42-cookbooks/zabbix-server.git" +cookbook "zabbix-server", :path => 'bw-cookbooks/zabbix-server' -cookbook "partition", - :git => "git@github.com:express42-cookbooks/partition.git" +cookbook "partition", :path => 'bw-cookbooks/partition' -cookbook "postgresql", - :git => "git@github.com:express42-cookbooks/postgresql.git" +cookbook "postgresql", :path => 'bw-cookbooks/postgresql' -cookbook "php", - :git => "git@github.com:express42-cookbooks/php.git" +cookbook "php", :path => 'bw-cookbooks/php' -cookbook "nginx", - :git => "git@github.com:evilmartians/chef-nginx.git" +cookbook "nginx", :path => 'bw-cookbooks/nginx' -cookbook "ruby", - :git => "git@github.com:express42-cookbooks/ruby.git" +cookbook "ruby", :path => 'bw-cookbooks/ruby' + +cookbook "runit", :path => 'bw-cookbooks/runit' cookbook "redmine", :git => "git@github.com:express42-cookbooks/redmine.git" - -cookbook "runit", - :git => "git@github.com:express42-cookbooks/runit.git" - diff --git a/Cheffile.lock b/Cheffile.lock index 00fd45f..dcf741a 100644 --- a/Cheffile.lock +++ b/Cheffile.lock @@ -1,33 +1,3 @@ -GIT - remote: git@github.com:evilmartians/chef-nginx.git - ref: master - sha: d0084e014b469a79ad7ab90635e20a06cbcafbe3 - specs: - nginx (2.2.0) - -GIT - remote: git@github.com:express42-cookbooks/partition.git - ref: master - sha: 2fa3aa3b1c9badaebcaeb63f05db37b138dec369 - specs: - partition (0.2.0) - lvm (>= 0.8.6) - zabbix (>= 0.1.1) - -GIT - remote: git@github.com:express42-cookbooks/php.git - ref: master - sha: 4764b5b668462208740f7eda1f4ddc5182d0ea1f - specs: - php (0.1.0) - -GIT - remote: git@github.com:express42-cookbooks/postgresql.git - ref: master - sha: ccf15076a95dc50059ff9cbc06cb6028d217341c - specs: - postgresql (0.2.3) - GIT remote: git@github.com:express42-cookbooks/redmine.git ref: master @@ -35,86 +5,86 @@ GIT specs: redmine (2.0.0) -GIT - remote: git@github.com:express42-cookbooks/ruby.git - ref: master - sha: 4cfa866373fb90dcb8ad4484d7eabceb5e56c5d5 +PATH + remote: bw-cookbooks/apt + specs: + apt (2.1.1) + +PATH + remote: bw-cookbooks/lvm + specs: + lvm (0.8.13) + +PATH + remote: bw-cookbooks/nginx + specs: + nginx (2.2.0) + +PATH + remote: bw-cookbooks/ntp + specs: + ntp (1.4.1) + +PATH + remote: bw-cookbooks/partition + specs: + partition (0.2.0) + lvm (>= 0.8.6) + zabbix (>= 0.1.1) + +PATH + remote: bw-cookbooks/php + specs: + php (0.1.0) + +PATH + remote: bw-cookbooks/postgresql + specs: + postgresql (0.2.3) + +PATH + remote: bw-cookbooks/ruby specs: ruby (0.1.2) -GIT - remote: git@github.com:express42-cookbooks/runit.git - ref: master - sha: d2e2f0bb1cd131db0d36f0baf4429585e0c360e4 +PATH + remote: bw-cookbooks/runit specs: runit (0.14.3) -GIT - remote: git@github.com:express42-cookbooks/sudo.git - ref: master - sha: e76baf470e25dac18014b423aa712b854c87d94c +PATH + remote: bw-cookbooks/sudo specs: sudo (1.1.1) -GIT - remote: git@github.com:express42-cookbooks/sysctl.git - ref: master - sha: ceca1b382f1cc434d3ba43502c301bfbe7c9ffbb +PATH + remote: bw-cookbooks/sysctl specs: sysctl (0.2.2) -GIT - remote: git@github.com:express42-cookbooks/timezone.git - ref: master - sha: cd8e67dd1076264b0d2ea0864432b74eaefffc8a +PATH + remote: bw-cookbooks/timezone specs: timezone (0.1.0) -GIT - remote: git@github.com:express42-cookbooks/zabbix-server.git - ref: master - sha: 8ee553759285af2bdb1ae3ce4261de8a0ee3f31b +PATH + remote: bw-cookbooks/user + specs: + user (0.3.1) + +PATH + remote: bw-cookbooks/zabbix + specs: + zabbix (0.2.0) + +PATH + remote: bw-cookbooks/zabbix-server specs: zabbix-server (0.1.0) lvm (>= 0.8.6) nginx (>= 2.2.0) partition (>= 0.1.0) -GIT - remote: git@github.com:express42-cookbooks/zabbix.git - ref: master - sha: ef96256ef9848f0332a9249e89f46e006ae58b60 - specs: - zabbix (0.2.0) - -GIT - remote: git@github.com:opscode-cookbooks/apt.git - ref: master - sha: b58c75536300794e5b5ffa8747fc9e6c48a4e5ce - specs: - apt (2.1.1) - -GIT - remote: https://github.com/fnichol/chef-user.git - ref: master - sha: ce45d05e13491a82cbb5a2c36292391f3a1aaa36 - specs: - user (0.3.1) - -GIT - remote: https://github.com/opscode-cookbooks/lvm.git - ref: master - sha: 5f76a85d4bf5ea56b37bf85e8326a8d7386f7054 - specs: - lvm (0.8.13) - -GIT - remote: https://github.com/opscode-cookbooks/ntp.git - ref: master - sha: 6e47826c939add35cec2a5b528cd187c7eb3f3b6 - specs: - ntp (1.4.1) - PATH remote: inhouse-cookbooks/base specs: