Merge pull request #20 from yeldiRium/bugfix/fix-vm-user

[BUGFIX] adjust user configuration in vm

Author: websi

Vagrantfile

@@ -5,7 +5,7 @@ unless Vagrant.has_plugin?('vagrant-berkshelf')
   abort
 end
 
-Vagrant.require_version '~> 2.0.0'
+Vagrant.require_version '~> 2.0'
 chef_version = '12.9.41'
 
 Vagrant.configure(2) do |config|

config/vm/cookbooks/dkdeploy-typo3-cms/recipes/default.rb

@@ -15,7 +15,7 @@
 group 'www-data' do
   action :create
   append true
-  members 'ubuntu'
+  members 'vagrant'
 end
 
 # PHP

features/support/env.rb

@@ -4,7 +4,7 @@
 ssh_key_files = Dir.glob(File.join(Dir.getwd, '.vagrant', 'machines', '**', 'virtualbox', 'private_key'))
 unless ssh_key_files.empty?
   # Define generated ssh key files
-  ssh_config = { user: 'ubuntu', keys: ssh_key_files }
+  ssh_config = { user: 'vagrant', keys: ssh_key_files }
 end
 
 TEST_APPLICATION = Dkdeploy::TestEnvironment::Application.new(File.expand_path('../../../', __FILE__), 'dkdeploy-typo3-cms.dev', ssh_config)

spec/fixtures/application/config/deploy/dev.rb

@@ -11,7 +11,7 @@
   # Define generated ssh key files
   set :ssh_options, fetch(:ssh_options).merge(
     {
-      user: 'ubuntu',
+      user: 'vagrant',
       keys: ssh_key_files
     }
   )