Sync with upstream/main and resolved conflicts

kubesmarts · Feb 17, 2025 · bef1157 · bef1157
1 parent 36ed8aa
commit bef1157
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/...nagement-console-image/generated/modules/osl-management-console/added/EnvJson.schema.json b/...nagement-console-image/generated/modules/osl-management-console/added/EnvJson.schema.json
@@ -24,9 +24,6 @@
         "KOGITO_CONSOLES_KEYCLOAK_URL": {
           "type": "string"
         },
-        "SONATAFLOW_MANAGEMENT_CONSOLE_DATA_INDEX_ENDPOINT": {
-          "type": "string"
-        },
         "SONATAFLOW_MANAGEMENT_CONSOLE_KOGITO_APP_NAME": {
           "type": "string"
         },
@@ -41,8 +38,7 @@
       "required": [
         "SONATAFLOW_MANAGEMENT_CONSOLE_KOGITO_ENV_MODE",
         "SONATAFLOW_MANAGEMENT_CONSOLE_KOGITO_APP_NAME",
-        "SONATAFLOW_MANAGEMENT_CONSOLE_KOGITO_APP_VERSION",
-        "SONATAFLOW_MANAGEMENT_CONSOLE_DATA_INDEX_ENDPOINT"
+        "SONATAFLOW_MANAGEMENT_CONSOLE_KOGITO_APP_VERSION"
       ],
       "type": "object"
     }

diff --git a/.../osl-management-console-image/generated/modules/osl-management-console/configure-httpd.sh b/.../osl-management-console-image/generated/modules/osl-management-console/configure-httpd.sh
@@ -31,8 +31,23 @@ sed -i "s/Listen 80/Listen ${SONATAFLOW_MANAGEMENT_CONSOLE_PORT}/g" "${HTTPD_MAI
 sed -i "s/#ServerName www.example.com:80/ServerName 127.0.0.1:${SONATAFLOW_MANAGEMENT_CONSOLE_PORT}/g" "${HTTPD_MAIN_CONF_PATH}/httpd.conf"
 sed -i '$ a ServerTokens Prod' "${HTTPD_MAIN_CONF_PATH}/httpd.conf"
 sed -i '$ a ServerSignature Off' "${HTTPD_MAIN_CONF_PATH}/httpd.conf"
-sed -i -e '/<Directory "\/var\/www\/html">/a    RewriteEngine on\n    RewriteCond %{REQUEST_FILENAME} -f [OR]\n    RewriteCond %{REQUEST_FILENAME} -d\n    RewriteRule ^ - [L]\n    RewriteRule ^ index.html [L]' "${HTTPD_MAIN_CONF_PATH}/httpd.conf"
+sed -i '$ a SSLProxyEngine on' "${HTTPD_MAIN_CONF_PATH}/httpd.conf"
 
+# Add RewriteRules
+sed -i -e '/<Directory "\/var\/www\/html">/a \
+    RewriteEngine on \
+    # Data Index rewrite rules \
+    RewriteCond %{REQUEST_URI} ^\/graphql([\/\?$]|$) \
+    RewriteCond %{ENV:SONATAFLOW_MANAGEMENT_CONSOLE_DATA_INDEX_ENDPOINT} ^$ \
+    RewriteRule ^.*$ - [R=503,L] \
+    RewriteCond %{REQUEST_URI} ^\/graphql([\/\?$]|$) \
+    RewriteCond %{ENV:SONATAFLOW_MANAGEMENT_CONSOLE_DATA_INDEX_ENDPOINT} ^(.*)$ \
+    RewriteRule ^.*$ %1 [P,L]\n \
+    RewriteCond %{REQUEST_FILENAME} -f [OR] \
+    RewriteCond %{REQUEST_FILENAME} -d \
+    RewriteRule ^ - [L] \
+    RewriteRule ^ index.html [L]\n' \
+    "${HTTPD_MAIN_CONF_PATH}/httpd.conf"
 
 # Set the required paths
 mkdir -p "${MGMT_CONSOLE_HOME}/launch"