"recipe[sdc-catalog-fe::FE_3_errors_config]",
"recipe[sdc-catalog-fe::FE_4_logback]",
"recipe[sdc-catalog-fe::FE_5_rest_configuration]",
- "recipe[sdc-catalog-fe::FE_7_locate_keystore]",
- "recipe[sdc-catalog-fe::FE_6_create_jetty_modules]"
+ "recipe[sdc-catalog-fe::FE_6_locate_keystore]",
+ "recipe[sdc-catalog-fe::FE_7_create_jetty_modules]"
],
"env_run_lists": {
}
-FROM jetty:9.3.15-jre8
+FROM jetty:9.3-jre8
ARG HTTP_PROXY
ARG HTTPS_PROXY
{
webseal {
- fe="http://localhost:8181"
+ fe="http://10.0.2.15:8181"
users = [
{
userId="cs0008"
owner "jetty"
group "jetty"
mode "0755"
-end
-
-
-cookbook_file "logback.xml" do
- path "#{jetty_base}/config/sdc-simulator/logback.xml"
- source "logback.xml"
- owner "jetty"
- group "jetty"
- mode "0755"
end
\ No newline at end of file
-#cookbook_file "/var/lib/jetty/config/catalog-fe/logback.xml" do
-# source "FE-logback.xml"
-# mode 0755
-# owner "jetty"
-# group "jetty"
-#end
-
+jetty_base="/var/lib/jetty"
+
+
+cookbook_file "logback.xml" do
+ path "#{jetty_base}/config/sdc-simulator/logback.xml"
+ source "logback.xml"
+ owner "jetty"
+ group "jetty"
+ mode "0755"
+end
\ No newline at end of file
+++ /dev/null
-jetty_base="/var/lib/jetty"
-jetty_home="/usr/local/jetty"
-
-###### create Jetty modules
-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 --add-to-startd=http,https,logging,setuid
-EOH
-not_if "ls /#{jetty_base}/start.d/https.ini"
-end
-
-
-###### configure Jetty modules
-template "FE-http-ini" do
- path "/#{jetty_base}/start.d/http.ini"
- source "FE-http-ini.erb"
- owner "jetty"
- group "jetty"
- mode "0755"
- variables :FE_http_port => "#{node['FE'][:http_port]}"
-end
-
-
-template "FE-https-ini" do
- path "/#{jetty_base}/start.d/https.ini"
- source "FE-https-ini.erb"
- owner "jetty"
- group "jetty"
- mode "0755"
- variables :FE_https_port => "#{node['FE'][:https_port]}"
-end
-
-
-template "FE-ssl-ini" do
- path "/#{jetty_base}/start.d/ssl.ini"
- source "FE-ssl-ini.erb"
- owner "jetty"
- group "jetty"
- mode "0755"
- variables :FE_https_port => "#{node['FE'][:https_port]}"
-end
-
--- /dev/null
+jetty_base="/var/lib/jetty"
+jetty_home="/usr/local/jetty"
+
+###### create Jetty modules
+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 --add-to-startd=http,https,logging,setuid
+EOH
+not_if "ls /#{jetty_base}/start.d/https.ini"
+end
+
+
+####### configure Jetty modules
+#template "SDC-Simulator-http-ini" do
+# path "/#{jetty_base}/start.d/http.ini"
+# source "SDC-Simulator-http-ini.erb"
+# owner "jetty"
+# group "jetty"
+# mode "0755"
+# variables :Simulator_http_port => "#{node['simulator'][:http_port]}"
+#end
+
+
+#template "FE-https-ini" do
+# path "/#{jetty_base}/start.d/https.ini"
+# source "FE-https-ini.erb"
+# owner "jetty"
+# group "jetty"
+# mode "0755"
+# variables :FE_https_port => "#{node['FE'][:https_port]}"
+#end
+#
+#
+#template "FE-ssl-ini" do
+# path "/#{jetty_base}/start.d/ssl.ini"
+# source "FE-ssl-ini.erb"
+# owner "jetty"
+# group "jetty"
+# mode "0755"
+# variables :FE_https_port => "#{node['FE'][:https_port]}"
+#end
+
# jetty.http.host=0.0.0.0
## Connector port to listen on
-jetty.http.port=<%= @FE_http_port %>
+jetty.http.port=<%= @Simulator_http_port %>
## Connector idle timeout in milliseconds
jetty.http.idleTimeout=30000
"run_list": [
"recipe[sdc-simulator::SDC_Simulator_1_cleanup_jettydir]",
"recipe[sdc-simulator::SDC_Simulator_2_setup_configuration]",
- "recipe[sdc-simulator::SDC_Simulator_7_locate_keystore]"
+ "recipe[sdc-simulator::SDC_Simulator_4_logback]",
+ "recipe[sdc-simulator::SDC_Simulator_6_locate_keystore]",
+ "recipe[sdc-simulator::SDC_Simulator_7_create_jetty_modules]"
],
"env_run_lists": {
}
chef-solo -c solo.rb
#chef-solo -c solo.rb -E ${CHEFNAME}
-sed -i '/^set -e/aJAVA_OPTIONS=\"-Xdebug -Xmx128m -Xms128m -Xss1m -Dconfig.home=${JETTY_BASE}/config -Dlog.home=${JETTY_BASE}/logs -Dlogback.configurationFile=${JETTY_BASE}/config/sdc-simulator/logback.xml -Djetty.logging.dir=${JETTY_BASE}/logs\"' /docker-entrypoint.sh
+sed -i '/^set -e/aJAVA_OPTIONS=\"-Xdebug -Xmx128m -Xms128m -Xss1m -Dconfig.home=${JETTY_BASE}/config/sdc-simulator -Dlog.home=${JETTY_BASE}/logs -Dlogback.configurationFile=${JETTY_BASE}/config/sdc-simulator/logback.xml -Djetty.logging.dir=${JETTY_BASE}/logs -Djetty.base=${JETTY_BASE} \"' /docker-entrypoint.sh
+#Moty Default WS startup args
+#/usr/bin/java -Dconfig.home=/apps/jetty/base/ws/config -Dlog.home=/apps/jetty/base/ws/logs -Dlogback.configurationFile=/apps/jetty/base/ws/logback.xml -Djetty.logging.dir=/apps/jetty/base/ws/logs -Djetty.home=/apps/jetty/jetty-distribution-9.3.6.v20151106 -Djetty.base=/apps/jetty/base/ws -Djava.io.tmpdir=/tmp -jar /apps/jetty/jetty-distribution-9.3.6.v20151106/start.jar jetty.state=/apps/jetty/base/ws/webseal-simulator.state jetty-logging.xml jetty-started.xml
sed -i '/^set -e/aTMPDIR=${JETTY_BASE}\/temp' /docker-entrypoint.sh
cd /var/lib/jetty
System.out.println("Login -> doPOst userId=" + userId);
User user = getUser(userId, password);
if (user == null) {
- request.setAttribute("message", "ERROR: userId or password incorect");
- doGet(request, response);
+ response.sendError(500, "ERROR: userId or password incorect");
+// doGet(request, response);
} else {
System.out.println("Login -> doPOst redirext to /sdc1 (to proxy)");
Cookie cookieUser = new Cookie("HTTP_IV_USER", user.getUserId());
Code Review / sdc.git / commitdiff