Skip to content
Snippets Groups Projects
Commit 0b2496c6 authored by Stefan Galinski's avatar Stefan Galinski :video_game:
Browse files

[FEATURE] Checkout the master branch by default

parent b15aacee
No related branches found
No related tags found
No related merge requests found
...@@ -174,8 +174,7 @@ if node['typo3_site']['repository'] != '' ...@@ -174,8 +174,7 @@ if node['typo3_site']['repository'] != ''
git "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}" do git "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}" do
repository node['typo3_site']['repository'] repository node['typo3_site']['repository']
remote 'origin' remote 'origin'
revision 'HEAD' revision 'master'
reference 'master'
timeout 100000 timeout 100000
user 'vagrant' user 'vagrant'
group 'vagrant' group 'vagrant'
...@@ -190,6 +189,7 @@ end ...@@ -190,6 +189,7 @@ end
bash 'Setup TYPO3' do bash 'Setup TYPO3' do
cwd '/home/vagrant/' cwd '/home/vagrant/'
user 'vagrant' user 'vagrant'
group 'vagrant' group 'vagrant'
timeout 3000000 timeout 3000000
...@@ -239,7 +239,7 @@ node['typo3_site']['sync_directories'].each do |sync_data| ...@@ -239,7 +239,7 @@ node['typo3_site']['sync_directories'].each do |sync_data|
group 'vagrant' group 'vagrant'
timeout 3000000 timeout 3000000
code <<-EOF 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']} \ --no-o --no-g #{sync_data['user']}@#{sync_data['hostname']}:#{sync_data['remote']} \
"#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/#{sync_data['local']}"; "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/#{sync_data['local']}";
EOF EOF
...@@ -348,7 +348,7 @@ node['typo3_site']['sync_databases'].each do |database_data| ...@@ -348,7 +348,7 @@ node['typo3_site']['sync_databases'].each do |database_data|
group 'vagrant' group 'vagrant'
timeout 3000000 timeout 3000000
code <<-EOF 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']} \ --no-o --no-g #{database_data['dump_user']}@#{database_data['dump_hostname']}:#{database_data['dump_remote']} \
#{database_data['dump_local']}; #{database_data['dump_local']};
EOF EOF
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment