copy from bitbucket

ausybenelux · Apr 4, 2016 · ee2cd6e · ee2cd6e
1 parent 22afd81
commit ee2cd6e
Show file tree

Hide file tree

Showing 62 changed files with 752 additions and 2,299 deletions.
diff --git a/Rakefile b/Rakefile
@@ -14,7 +14,7 @@ namespace :core do
   task :up do
     puts "up"
     begin
-      sh "ssh-add -K ~/.ssh/id_rsa && vagrant up"
+      sh "ssh-add -K ~/.ssh/id_rsa && vagrant up && vagrant ssh"
     rescue
     end
   end

diff --git a/Vagrantfile b/Vagrantfile
@@ -37,11 +37,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vagrant.host = :detect
 
   #
-  config.vm.box = vconfig['config']['box_type']
   config.vm.box_check_update = false
+  config.vm.box = vconfig['config']['box_type']
   config.vm.box_url = vconfig['config']['box_url']
-  #
-#  config.omnibus.chef_version = '12'
 
   # Hostname
   config.vm.hostname = box_hostname

diff --git a/chef-repo/Cheffile b/chef-repo/Cheffile
@@ -11,8 +11,6 @@ cookbook 'apache2'
 cookbook 'php'
 cookbook 'composer'
 cookbook 'phing'
-cookbook 'hipsnip-jetty'
-cookbook 'hipsnip-solr'
 cookbook 'memcached'
 cookbook 'varnish', '= 1.0.2'
 cookbook 'php-fpm'

diff --git a/chef-repo/cookbooks/hipsnip-jetty/LICENCE b/chef-repo/cookbooks/hipsnip-jetty/LICENCE
diff --git a/chef-repo/cookbooks/hipsnip-jetty/README.md b/chef-repo/cookbooks/hipsnip-jetty/README.md
diff --git a/chef-repo/cookbooks/hipsnip-jetty/attributes/default.rb b/chef-repo/cookbooks/hipsnip-jetty/attributes/default.rb