Redirect root URL to sdc1

Change-Id: I792cf2bfbb2f8f1e891d30048ff63acefac3604e
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3877

diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb
index 0a1527f..fb70924 100644 (file)
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb
@@ -7,7 +7,7 @@ else
 end
 
 execute "create-jetty-modules" do
-  command "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"
+  command "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,rewrite"
   cwd "#{ENV['JETTY_BASE']}"
   action :run
 end
@@ -24,7 +24,6 @@ template "http-ini" do
     })
 end
 
-
 template "https-ini" do
    path "#{ENV['JETTY_BASE']}/start.d/https.ini"
    source "https-ini.erb"
@@ -34,6 +33,13 @@ template "https-ini" do
    variables :https_port => "#{node['FE'][:https_port]}"
 end
 
+template "jetty-rewrite" do
+  path "#{ENV['JETTY_BASE']}/etc/rewrite-root-to-sdc1.xml"
+  source "FE-jetty-rewrite.yaml.erb"
+  owner "#{ENV['JETTY_USER']}"
+  group "#{ENV['JETTY_GROUP']}"
+  mode "0644"
+end
 
 template "ssl-ini" do
    path "#{ENV['JETTY_BASE']}/start.d/ssl.ini"

diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-jetty-rewrite.yaml.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-jetty-rewrite.yaml.erb
new file mode 100644 (file)
index 0000000..e0862a5
--- /dev/null
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-jetty-rewrite.yaml.erb
@@ -0,0 +1,19 @@
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+  <Ref refid="Rewrite">
+    <Call name="addRule">
+      <Arg>
+        <New class="org.eclipse.jetty.rewrite.handler.RedirectPatternRule">
+          <Set name="pattern" type="String"/>
+          <Set name="location">/sdc1</Set>
+        </New>
+      </Arg>
+    </Call>
+  </Ref>
+  <!-- ===================== -->
+  <!-- DefaultHandler config -->
+  <!-- ===================== -->
+  <Ref id="DefaultHandler">
+    <Set name="showContexts">false</Set>
+  </Ref>
+</Configure>

diff --git a/catalog-fe/sdc-frontend/startup.sh b/catalog-fe/sdc-frontend/startup.sh
index 5a1dd27..7597699 100644 (file)
--- a/catalog-fe/sdc-frontend/startup.sh
+++ b/catalog-fe/sdc-frontend/startup.sh
@@ -14,5 +14,6 @@ cd $JETTY_BASE/chef-solo
 chef-solo -c solo.rb -E ${ENVNAME}
 
 cd $JETTY_HOME
+echo "etc/rewrite-root-to-sdc1.xml" >> $JETTY_HOME/start.d/rewrite.ini
 
 java $JAVA_OPTIONS -jar "${JETTY_HOME}/start.jar"

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 5e0d8eb..1e1ff79 100644 (file)
--- 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,55 +1,62 @@
 #
 # Set the http module option
 if node['disableHttp']
-   http_option = "#--module=http"
+  http_option = "#--module=http"
 else
-   http_option = "--module=http"
+  http_option = "--module=http"
 end
 
 execute "create-jetty-modules" do
-  command "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"
+  command "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,rewrite"
   cwd "#{ENV['JETTY_BASE']}"
   action :run
 end
 
 template "http-ini" do
-   path "#{ENV['JETTY_BASE']}/start.d/http.ini"
-   source "SDC-Simulator-http-ini.erb"
-   owner "#{ENV['JETTY_USER']}"
-   group "#{ENV['JETTY_GROUP']}"
-   mode "0755"
-   variables({
-      :http_option => http_option,
-      :http_port => "8080"
-   })
+  path "#{ENV['JETTY_BASE']}/start.d/http.ini"
+  source "SDC-Simulator-http-ini.erb"
+  owner "#{ENV['JETTY_USER']}"
+  group "#{ENV['JETTY_GROUP']}"
+  mode "0755"
+  variables({
+              :http_option => http_option,
+              :http_port => "8080"
+            })
 end
 
+template "jetty-rewrite" do
+  path "#{ENV['JETTY_BASE']}/etc/rewrite-root-to-sdc1.xml"
+  source "SDC-Simulator-jetty-rewrire.xml.erb"
+  owner "#{ENV['JETTY_USER']}"
+  group "#{ENV['JETTY_GROUP']}"
+  mode "0644"
+end
 
 template "https-ini" do
-   path "#{ENV['JETTY_BASE']}/start.d/https.ini"
-   source "SDC-Simulator-https-ini.erb"
-   owner "#{ENV['JETTY_USER']}"
-   group "#{ENV['JETTY_GROUP']}"
-   mode "0755"
-   variables({
-      :https_port => "8443"
-   })
+  path "#{ENV['JETTY_BASE']}/start.d/https.ini"
+  source "SDC-Simulator-https-ini.erb"
+  owner "#{ENV['JETTY_USER']}"
+  group "#{ENV['JETTY_GROUP']}"
+  mode "0755"
+  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 "#{ENV['JETTY_USER']}"
-   group "#{ENV['JETTY_GROUP']}"
-   mode "0755"
-   variables({
-     :https_port           => "8443",
-     :jetty_truststore_pwd => "z+KEj;t+,KN^iimSiS89e#p0",
-     :jetty_keystore_pwd   => "?(kP!Yur![*!Y5!E^f(ZKc31",
-     :jetty_keymanager_pwd => "?(kP!Yur![*!Y5!E^f(ZKc31",
-   })
+  path "#{ENV['JETTY_BASE']}/start.d/ssl.ini"
+  source "SDC-Simulator-ssl-ini.erb"
+  owner "#{ENV['JETTY_USER']}"
+  group "#{ENV['JETTY_GROUP']}"
+  mode "0755"
+  variables({
+              :https_port => "8443",
+              :jetty_truststore_pwd => "z+KEj;t+,KN^iimSiS89e#p0",
+              :jetty_keystore_pwd => "?(kP!Yur![*!Y5!E^f(ZKc31",
+              :jetty_keymanager_pwd => "?(kP!Yur![*!Y5!E^f(ZKc31",
+            })
 end
 
 execute "echo status" do

diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/templates/default/SDC-Simulator-jetty-rewrire.xml.erb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/templates/default/SDC-Simulator-jetty-rewrire.xml.erb
new file mode 100644 (file)
index 0000000..e0862a5
--- /dev/null
+++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/templates/default/SDC-Simulator-jetty-rewrire.xml.erb
@@ -0,0 +1,19 @@
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+  <Ref refid="Rewrite">
+    <Call name="addRule">
+      <Arg>
+        <New class="org.eclipse.jetty.rewrite.handler.RedirectPatternRule">
+          <Set name="pattern" type="String"/>
+          <Set name="location">/sdc1</Set>
+        </New>
+      </Arg>
+    </Call>
+  </Ref>
+  <!-- ===================== -->
+  <!-- DefaultHandler config -->
+  <!-- ===================== -->
+  <Ref id="DefaultHandler">
+    <Set name="showContexts">false</Set>
+  </Ref>
+</Configure>

diff --git a/utils/webseal-simulator/sdc-simulator/startup.sh b/utils/webseal-simulator/sdc-simulator/startup.sh
index 49fdf3e..d218211 100644 (file)
--- a/utils/webseal-simulator/sdc-simulator/startup.sh
+++ b/utils/webseal-simulator/sdc-simulator/startup.sh
@@ -13,5 +13,6 @@ cd $JETTY_BASE/chef-solo
 chef-solo -c solo.rb -E ${ENVNAME}
 
 cd $JETTY_HOME
+echo "etc/rewrite-root-to-sdc1.xml" >> $JETTY_HOME/start.d/rewrite.ini
 
 java $JAVA_OPTIONS -jar "${JETTY_HOME}/start.jar"