Merge pull request #540 from carbonin/add_remote_console_proxy

Add httpd config for rewriting remote consoles to the correct service
ManageIQ · Jun 8, 2020 · 457ba08 · 457ba08
2 parents e86882c + 7c8768b
commit 457ba08
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/manageiq-operator/pkg/helpers/miq-components/httpd_conf.go b/manageiq-operator/pkg/helpers/miq-components/httpd_conf.go
@@ -54,6 +54,12 @@ Options SymLinksIfOwnerMatch
   ProxyPass /api http://web-service:3000/api
   ProxyPassReverse /api http://web-service:3000/api
 
+  RewriteCond %{REQUEST_URI}     ^/ws/console [NC]
+  RewriteCond %{HTTP:UPGRADE}    ^websocket$  [NC]
+  RewriteCond %{HTTP:CONNECTION} ^Upgrade$    [NC]
+  RewriteRule .* ws://remote-console:3000%{REQUEST_URI}  [P,QSA,L]
+  ProxyPassReverse /ws/console ws://remote-console:3000/ws/console
+
   # Ensures httpd stdout/stderr are seen by 'docker logs'.
   ErrorLog  "| /usr/bin/tee /proc/1/fd/2 /var/log/httpd/error_log"
   CustomLog "| /usr/bin/tee /proc/1/fd/1 /var/log/httpd/access_log" common

diff --git a/templates/app/httpd.yaml b/templates/app/httpd.yaml
@@ -45,6 +45,12 @@ objects:
         ProxyPass /api http://web-service:3000/api
         ProxyPassReverse /api http://web-service:3000/api
 
+        RewriteCond %{REQUEST_URI}     ^/ws/console [NC]
+        RewriteCond %{HTTP:UPGRADE}    ^websocket$  [NC]
+        RewriteCond %{HTTP:CONNECTION} ^Upgrade$    [NC]
+        RewriteRule .* ws://remote-console:3000%{REQUEST_URI}  [P,QSA,L]
+        ProxyPassReverse /ws/console ws://remote-console:3000/ws/console
+
         # Ensures httpd stdout/stderr are seen by 'docker logs'.
         ErrorLog  "| /usr/bin/tee /proc/1/fd/2 /var/log/httpd/error_log"
         CustomLog "| /usr/bin/tee /proc/1/fd/1 /var/log/httpd/access_log" common