2 files changed, 2 insertions, 50 deletions
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_10_setup_cadi.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_10_setup_cadi.rb
index b06f8a5342..3a79cfc874 100644
--- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_10_setup_cadi.rb
+++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_10_setup_cadi.rb
@@ -35,51 +35,3 @@ template "#{jetty_base}/etc/cadi.properties" do
   mode "0755"
 end
 
-
-#Workaround due to hardcode definition in cata,log-be web.xml file
-directory "/opt/app/jetty" do
-  path "/opt/app/jetty"
-  owner 'jetty'
-  group 'jetty'
-  mode '0755'
-  recursive true
-  action :create
-end
-
-directory "/opt/app/jetty/base/" do
-  path "/opt/app/jetty/base/"
-  owner 'jetty'
-  group 'jetty'
-  mode '0755'
-  recursive true
-  action :create
-end
-
-
-directory "/opt/app/jetty/base/be/" do
-  path "/opt/app/jetty/base/be/"
-  owner 'jetty'
-  group 'jetty'
-  mode '0755'
-  recursive true
-  action :create
-end
-
-directory "/opt/app/jetty/base/be/etc" do
-  path "/opt/app/jetty/base/be/etc"
-  owner 'jetty'
-  group 'jetty'
-  mode '0755'
-  recursive true
-  action :create
-end
-
-#Workaround due to hardcode definition in catalog-be web.xml file
-template "/opt/app/jetty/base/be/etc/cadi.properties" do
-  path "/opt/app/jetty/base/be/etc/cadi.properties"
-  source "cadi.properties.erb"
-  owner "jetty"
-  group "jetty"
-  mode "0755"
-end
-
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_9_prepareProbeFile.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_9_prepareProbeFile.rb
index 8d42c26acc..81e1a855f4 100644
--- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_9_prepareProbeFile.rb
+++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_9_prepareProbeFile.rb
@@ -6,7 +6,7 @@ else
   port = "#{node['BE'][:http_port]}"
 end
 
-template "/var/lib/ready-probe.sh" do
+template "/var/lib/jetty/ready-probe.sh" do
   source "ready-probe.sh.erb"
   sensitive true
   mode 0755
@@ -14,4 +14,4 @@ template "/var/lib/ready-probe.sh" do
     :protocol => protocol,
     :port => port
   })
-end
-\ No newline at end of file
+end