From aeae4e1bfab98433489150d53378bf9bbcfdfbdd Mon Sep 17 00:00:00 2001
From: Stefan Galinski <stefan@sgalinski.de>
Date: Sat, 25 Apr 2015 13:28:47 +0200
Subject: [PATCH] [BUGFIX] More robust integration of the SiteConfiguration.php
---
recipes/default.rb | 45 +++++++++++--------
.../default/AdditionalConfiguration.php.erb | 3 ++
...guration.erb => SiteConfiguration.php.erb} | 0
3 files changed, 29 insertions(+), 19 deletions(-)
create mode 100644 templates/default/AdditionalConfiguration.php.erb
rename templates/default/{SiteConfiguration.erb => SiteConfiguration.php.erb} (100%)
diff --git a/recipes/default.rb b/recipes/default.rb
index d90c8c2..0807115 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -210,25 +210,6 @@ bash 'Setup TYPO3' do
action :run
end
-###########################################
-### Provide site specific configuration ###
-###########################################
-
-directory "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/typo3conf/" do
- owner 'vagrant'
- mode '0755'
- action :create
-end
-
-template "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/typo3conf/#{node['typo3_site']['site_configuration']}" do
- source 'SiteConfiguration.erb'
- owner 'vagrant'
- mode '0660'
- variables ({
- :group_id => data_bag['groupId']
- })
-end
-
#########################
### Synchronize Files ###
#########################
@@ -261,6 +242,32 @@ node['typo3_site']['create_links'].each do |link_data|
end
end
+###########################################
+### Provide site specific configuration ###
+###########################################
+
+directory "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/typo3conf/" do
+ owner 'vagrant'
+ mode '0755'
+ action :create
+end
+
+template "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/typo3conf/#{node['typo3_site']['site_configuration']}" do
+ source 'SiteConfiguration.php.erb'
+ owner 'vagrant'
+ mode '0660'
+ variables ({
+ :group_id => data_bag['groupId']
+ })
+end
+
+template "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/typo3conf/AdditionalConfiguration.php" do
+ source 'AdditionalConfiguration.php.erb'
+ owner 'vagrant'
+ mode '0660'
+ action :create_if_missing
+end
+
###################
### Setup MySQL ###
###################
diff --git a/templates/default/AdditionalConfiguration.php.erb b/templates/default/AdditionalConfiguration.php.erb
new file mode 100644
index 0000000..d8da0f2
--- /dev/null
+++ b/templates/default/AdditionalConfiguration.php.erb
@@ -0,0 +1,3 @@
+<?php
+
+require_once('SiteConfiguration.php');
\ No newline at end of file
diff --git a/templates/default/SiteConfiguration.erb b/templates/default/SiteConfiguration.php.erb
similarity index 100%
rename from templates/default/SiteConfiguration.erb
rename to templates/default/SiteConfiguration.php.erb
--
GitLab