Merge pull request #737 from elijah/master

Update roles to the current recipe names so that 'vagrant up' works out of the box.

Andrew Cantino лет %!s(int64=9): %!d(string=назад)
Родитель
Сommit
ad690ef2e9
3 измененных файлов с 3 добавлено и 2 удалено
  1. 1 0
      deployment/Cheffile
  2. 1 1
      deployment/roles/huginn_development.json
  3. 1 1
      deployment/roles/huginn_production.json

+ 1 - 0
deployment/Cheffile

@@ -3,6 +3,7 @@
3 3
 
4 4
 site 'http://community.opscode.com/api/v1'
5 5
 
6
+cookbook 'ark'
6 7
 cookbook 'runit'
7 8
 cookbook 'git', :git => 'git://github.com/opscode-cookbooks/git.git'
8 9
 cookbook 'nginx', :git => 'git://github.com/opscode-cookbooks/nginx.git'

+ 1 - 1
deployment/roles/huginn_development.json

@@ -24,7 +24,7 @@
24 24
              "recipe[apt]",
25 25
              "recipe[mysql::server]",
26 26
              "recipe[mysql::client]",
27
-             "recipe[nodejs::install_from_binary]",
27
+             "recipe[nodejs::nodejs_from_binary]",
28 28
              "recipe[huginn_development]"
29 29
            ]
30 30
 }

+ 1 - 1
deployment/roles/huginn_production.json

@@ -23,7 +23,7 @@
23 23
              "recipe[git]",
24 24
              "recipe[apt]",
25 25
              "recipe[mysql::server]",
26
-             "recipe[nodejs::install_from_binary]",
26
+             "recipe[nodejs::nodejs_from_binary]",
27 27
              "recipe[nginx]",
28 28
              "recipe[huginn_production]"
29 29
            ]