Merge pull request #9432 from himdel/bz1347319,1347312

MiqApache::Conf - update SSUI redirects to allow bower_components/ and gettext/
ManageIQ · Jun 24, 2016 · a554bf5 · a554bf5
2 parents 1d10148 + 16771e0
commit a554bf5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gems/pending/spec/util/miq_apache/conf_spec.rb b/gems/pending/spec/util/miq_apache/conf_spec.rb
@@ -40,7 +40,7 @@
     it "sets root balancer correctly" do
       default_options = {:cluster => 'evmcluster_ui', :redirects => %w(/)}
       output = MiqApache::Conf.create_redirects_config(default_options).lines.to_a
-      expect(output).to include("RewriteRule ^/self_service(?!/(assets|images|img|styles|js|fonts)) /self_service/index.html [L]\n")
+      expect(output).to include("RewriteRule ^/self_service(?!/(assets|images|img|styles|js|fonts|bower_components|gettext)) /self_service/index.html [L]\n")
       expect(output).to include("RewriteCond \%{REQUEST_URI} !^/proxy_pages\n")
       expect(output).to include("RewriteCond \%{REQUEST_URI} !^/saml2\n")
       expect(output).to include("RewriteCond \%{DOCUMENT_ROOT}/\%{REQUEST_FILENAME} !-f\n")

diff --git a/gems/pending/util/miq_apache/miq_apache.rb b/gems/pending/util/miq_apache/miq_apache.rb
@@ -206,7 +206,7 @@ def self.create_balancer_config(opts = {})
     def self.create_redirects_config(opts = {})
       opts[:redirects].to_miq_a.each_with_object("") do |redirect, content|
         if redirect == "/"
-          content << "RewriteRule ^/self_service(?!/(assets|images|img|styles|js|fonts)) /self_service/index.html [L]\n"
+          content << "RewriteRule ^/self_service(?!/(assets|images|img|styles|js|fonts|bower_components|gettext)) /self_service/index.html [L]\n"
           content << "RewriteCond \%{REQUEST_URI} !^/ws\n"
           content << "RewriteCond \%{REQUEST_URI} !^/proxy_pages\n"
           content << "RewriteCond \%{REQUEST_URI} !^/saml2\n"