From b15aaceebbc3efc12ffccbae69b2a967c89bfc0c Mon Sep 17 00:00:00 2001
From: Stefan Galinski <stefan@sgalinski.de>
Date: Sat, 25 Apr 2015 15:24:22 +0200
Subject: [PATCH] [BUGFIX] Readd ssh wrapper script for git
---
recipes/default.rb | 10 +++++++++-
...nfiguration.php.erb => AdditionalConfiguration.php} | 0
2 files changed, 9 insertions(+), 1 deletion(-)
rename templates/default/{AdditionalConfiguration.php.erb => AdditionalConfiguration.php} (100%)
diff --git a/recipes/default.rb b/recipes/default.rb
index 2c1bf5b..84c83c0 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -159,6 +159,13 @@ end
### Provide Sources ###
#######################
+file '/home/vagrant/ssh_wrapper.sh' do
+ owner 'vagrant'
+ group 'vagrant'
+ mode '0755'
+ content "#!/bin/sh\nexec /usr/bin/ssh -o \"StrictHostKeyChecking=no\" \"$@\""
+end
+
if node['typo3_site']['repository'] != ''
ssh_known_hosts_entry node['typo3_site']['repository_hostname'] do
port node['typo3_site']['repository_port']
@@ -173,6 +180,7 @@ if node['typo3_site']['repository'] != ''
user 'vagrant'
group 'vagrant'
action :checkout
+ ssh_wrapper '/home/vagrant/ssh_wrapper.sh'
end
end
@@ -269,7 +277,7 @@ template "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/typ
end
template "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/typo3conf/AdditionalConfiguration.php" do
- source 'AdditionalConfiguration.php.erb'
+ source 'AdditionalConfiguration.php'
owner 'vagrant'
mode '0660'
action :create_if_missing
diff --git a/templates/default/AdditionalConfiguration.php.erb b/templates/default/AdditionalConfiguration.php
similarity index 100%
rename from templates/default/AdditionalConfiguration.php.erb
rename to templates/default/AdditionalConfiguration.php
--
GitLab