X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker%2Fdocker_be%2Fchef-repo%2Fcookbooks%2FDeploy-DCAE%2Frecipes%2Fjetty_setup.rb;fp=docker%2Fdocker_be%2Fchef-solo%2Fcookbooks%2FDeploy-DCAE%2Frecipes%2Fjetty_setup.rb;h=36f6853858ea0f826ee7f7f6ed761137c64058c0;hb=64636c2148414c1fa5da4b46a69570cdab003837;hp=43919edf2c9445a258b9f6eef4c3c117fbddd071;hpb=5a4e1827b867a2de46c14f32449b37d0ff60d1fd;p=sdc%2Fdcae-d%2Fdt-be-main.git

diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb
similarity index 67%
rename from docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb
rename to docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb
index 43919ed..36f6853 100644
--- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb
+++ b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb
@@ -1,6 +1,3 @@
-jetty_base = "#{node['JETTY_BASE']}"
-jetty_home = "#{node['JETTY_HOME']}"
-
 #Set the http module option
 if node['disableHttp']
   http_option = "#--module=http"
@@ -13,7 +10,7 @@ printf("DEBUG: [%s]:[%s] disableHttp=[%s], http_option=[%s] !!! \n", cookbook_na
 
 
 directory "Jetty_etcdir_creation" do
-    path "/#{jetty_base}/etc"
+    path "#{ENV['JETTY_BASE']}/etc"
     owner 'jetty'
     group 'jetty'
     mode '0755'
@@ -21,66 +18,67 @@ directory "Jetty_etcdir_creation" do
 end
 
 
-# Create Keystore
-cookbook_file "/#{jetty_base}/etc/org.onap.sdc.p12" do
+cookbook_file "#{ENV['JETTY_BASE']}/etc/org.onap.sdc.p12" do
    source "org.onap.sdc.p12"
    owner "jetty"
    group "jetty"
    mode 0755
 end
 
-# Create Truststore
-cookbook_file "/#{jetty_base}/etc/org.onap.sdc.trust.jks" do
+
+cookbook_file "#{ENV['JETTY_BASE']}/etc/org.onap.sdc.trust.jks" do
    source "org.onap.sdc.trust.jks"
    owner "jetty"
    group "jetty"
    mode 0755
 end
 
+
 bash "create-jetty-modules" do
-  cwd "#{jetty_base}"
+  cwd "#{ENV['JETTY_BASE']}"
   code <<-EOH
-    cd "#{jetty_base}"
-    java -jar "/#{jetty_home}"/start.jar --add-to-start=deploy
-    java -jar "/#{jetty_home}"/start.jar --add-to-startd=http,https,logging,setuid
+    cd "#{ENV['JETTY_BASE']}"
+    java -jar "/#{ENV['JETTY_HOME']}"/start.jar --add-to-start=deploy
+    java -jar "/#{ENV['JETTY_HOME']}"/start.jar --add-to-startd=http,https,console-capture,setuid
   EOH
 end
 
-# configure Jetty modules
+
 template "http-ini" do
-   path "/#{jetty_base}/start.d/http.ini"
+   path "#{ENV['JETTY_BASE']}/start.d/http.ini"
    source "http-ini.erb"
    owner "jetty"
    group "jetty"
    mode "0755"
-   variables ({
+   variables({
      :http_option => http_option ,
      :http_port => "#{node['DCAE']['BE'][:http_port]}"
     })
 end
 
+
 template "https-ini" do
-   path "/#{jetty_base}/start.d/https.ini"
+   path "#{ENV['JETTY_BASE']}/start.d/https.ini"
    source "https-ini.erb"
    owner "jetty"
    group "jetty"
    mode "0755"
-   variables ({
+   variables({
      :https_port => "#{node['DCAE']['BE'][:https_port]}"
    })
 end
 
+
 template "ssl-ini" do
-   path "/#{jetty_base}/start.d/ssl.ini"
+   path "#{ENV['JETTY_BASE']}/start.d/ssl.ini"
    source "ssl-ini.erb"
    owner "jetty"
    group "jetty"
    mode "0755"
-   variables ({ 
+   variables({
      :https_port => "#{node['DCAE']['BE'][:https_port]}" ,
      :jetty_keystore_pwd => "#{node['jetty'][:keystore_pwd]}" ,
      :jetty_keymanager_pwd => "#{node['jetty'][:keymanager_pwd]}" ,
      :jetty_truststore_pwd => "#{node['jetty'][:truststore_pwd]}"
    })
 end
-