1 files changed, 41 insertions, 17 deletions
diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb
index 4f7e710d63..71366a5148 100644
--- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb
+++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb
@@ -1,39 +1,63 @@
-jetty_base="/var/lib/jetty"
-jetty_home="/usr/local/jetty"
+#
+# Set the http module option
+if node['disableHttp']
+   http_option = "#--module=http"
+else
+   http_option = "--module=http"
+end
+
 
 bash "create-jetty-modules" do
-cwd "#{jetty_base}"
-code <<-EOH
-   cd "#{jetty_base}"
-   java -jar "/#{jetty_home}"/start.jar --add-to-start=deploy
-   java -jar "/#{jetty_home}"/start.jar --create-startd --add-to-start=http,https,console-capture,setuid
-EOH
+   cwd "#{ENV['JETTY_BASE']}"
+   code <<-EOH
+   cd "#{ENV['JETTY_BASE']}"
+   java -jar "#{ENV['JETTY_HOME']}"/start.jar --add-to-start=deploy
+   java -jar "#{ENV['JETTY_HOME']}"/start.jar --create-startd --add-to-start=http,https,console-capture,setuid
+   EOH
 end
 
-template "ssl-ini" do
-   path "/#{jetty_base}/start.d/ssl.ini"
-   source "SDC-Simulator-ssl-ini.erb"
+
+template "http-ini" do
+   path "#{ENV['JETTY_BASE']}/start.d/http.ini"
+   source "SDC-Simulator-http-ini.erb"
    owner "jetty"
    group "jetty"
    mode "0755"
    variables({
-        :https_port           => "8443",
-        :jetty_keystore_pwd   => "rTIS;B4kM]2GHcNK2c3B4&Ng",
-        :jetty_keymanager_pwd => "rTIS;B4kM]2GHcNK2c3B4&Ng"
+      :http_option => http_option,
+      :http_port => "8080"
    })
 end
 
+
 template "https-ini" do
-   path "/#{jetty_base}/start.d/https.ini"
+   path "#{ENV['JETTY_BASE']}/start.d/https.ini"
    source "SDC-Simulator-https-ini.erb"
    owner "jetty"
    group "jetty"
    mode "0755"
-   variables ({
-        :https_port => "8443"
+   variables({
+      :https_port => "8443"
    })
 end
 
+# TO CHANGE THE KEYSTORE/TRUSTSTORE CERT THE JVM CONFIGURATION
+# MUST BE ALSO CHANGE IN THE startup.sh FILE
+template "ssl-ini" do
+   path "#{ENV['JETTY_BASE']}/start.d/ssl.ini"
+   source "SDC-Simulator-ssl-ini.erb"
+   owner "jetty"
+   group "jetty"
+   mode "0755"
+   variables({
+     :https_port           => "8443",
+     :jetty_truststore_pwd => "Y,f975ZNJfVZhV*{+Y[}pA?0",
+     :jetty_keystore_pwd   => "rTIS;B4kM]2GHcNK2c3B4&Ng",
+     :jetty_keymanager_pwd => "rTIS;B4kM]2GHcNK2c3B4&Ng",
+   })
+end
+
+
 bash "echo status" do
    code <<-EOH
       echo "DOCKER STARTED"