Remove zsh & fix role varnish

ausybenelux · Oct 27, 2015 · 922c211 · 922c211
1 parent 6ec94ce
commit 922c211
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/chef-repo/roles/varnish.json → chef-repo/roles/web-varnish.json b/chef-repo/roles/varnish.json → chef-repo/roles/web-varnish.json
diff --git a/chef-repo/site-cookbooks/system/metadata.rb b/chef-repo/site-cookbooks/system/metadata.rb
@@ -21,7 +21,6 @@
 recipe 'system::default', 'Default'
 recipe 'system::apt', 'Apt'
 recipe 'system::build', 'Build-essential'
-recipe 'system::extra', 'Extra'
 recipe 'system::zsh', 'Zsh'
 recipe 'system::java', 'Java'
 recipe 'system::java_repo', 'Java repo'

diff --git a/chef-repo/site-cookbooks/system/recipes/default.rb b/chef-repo/site-cookbooks/system/recipes/default.rb
@@ -7,12 +7,16 @@
 
 include_recipe "system::build"
 
-include_recipe "system::extra"
-
 include_recipe "system::java"
 
 include_recipe "system::ruby"
 
 include_recipe "system::cachefilesd"
 
 include_recipe "system::inosync"
+
+include_recipe "git"
+
+include_recipe "curl"
+
+include_recipe "vim"
diff --git a/chef-repo/site-cookbooks/system/recipes/extra.rb b/chef-repo/site-cookbooks/system/recipes/extra.rb