Better handle older deploys with solr.

tanaylakhani · Nov 24, 2014 · 9f4271c · 9f4271c
1 parent ccd5a83
commit 9f4271c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/plone_buildout/recipes/solr.rb b/plone_buildout/recipes/solr.rb
@@ -15,8 +15,10 @@
  mode 0755
  recursive true
  end
- link ::File.join(deploy[:deploy_to], "shared", "var") do
- to node["plone_solr"]["data_dir"]
+ if ::File.exists?(node["plone_solr"]["data_dir"]) && node["plone_solr"]["data_dir"] != ::File.join(deploy[:deploy_to], "shared", "var")
+ link ::File.join(deploy[:deploy_to], "shared", "var") do
+ to node["plone_solr"]["data_dir"]
+ end
  end
  directory ::File.join(deploy[:deploy_to], "shared", "parts", "solr-download") do
  recursive true