diff --git a/recipes/default.rb b/recipes/default.rb index 84c83c075b835043456e29ac8b4776570998a069..65982f31eed46c29b3e49375f9fa40208d5fa524 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -174,8 +174,7 @@ if node['typo3_site']['repository'] != '' git "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}" do repository node['typo3_site']['repository'] remote 'origin' - revision 'HEAD' - reference 'master' + revision 'master' timeout 100000 user 'vagrant' group 'vagrant' @@ -190,6 +189,7 @@ end bash 'Setup TYPO3' do cwd '/home/vagrant/' + user 'vagrant' group 'vagrant' timeout 3000000 @@ -239,7 +239,7 @@ node['typo3_site']['sync_directories'].each do |sync_data| group 'vagrant' timeout 3000000 code <<-EOF - rsync --delete -auvz --progress -e "ssh -i /home/vagrant/.ssh/id_rsa -p #{sync_data['port']} -o StrictHostKeyChecking=no" \ + rsync --delete -auvz --progress -e "ssh -p #{sync_data['port']} -o StrictHostKeyChecking=no" \ --no-o --no-g #{sync_data['user']}@#{sync_data['hostname']}:#{sync_data['remote']} \ "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/#{sync_data['local']}"; EOF @@ -348,7 +348,7 @@ node['typo3_site']['sync_databases'].each do |database_data| group 'vagrant' timeout 3000000 code <<-EOF - rsync --delete -auvz --progress -e "ssh -i /home/vagrant/.ssh/id_rsa -p #{database_data['dump_port']} -o StrictHostKeyChecking=no" \ + rsync --delete -auvz --progress -e "ssh -p #{database_data['dump_port']} -o StrictHostKeyChecking=no" \ --no-o --no-g #{database_data['dump_user']}@#{database_data['dump_hostname']}:#{database_data['dump_remote']} \ #{database_data['dump_local']}; EOF