Merge branch 'ngala/fix-pages-nginx' into 'master'

Fix Pages Nginx location block rendering incorrect file

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7303

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Clemens Beck <[email protected]>
Co-authored-by: ngala <[email protected]>

Author: balasankarc

files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-pages-http.conf.erb

@@ -50,7 +50,7 @@ server {
     <% end %>
     proxy_set_header X-Gitlab-Namespace-In-Path $namespace;
 
-    <%= render "nginx-gitlab-pages-http-common-server.erb" %>
+    <%= render "nginx-gitlab-pages-http-common-location.erb" %>
 
     ## Put namespace in path from host before sending it to the user
   <% @proxy_redirect.each do |redirect| %>

spec/chef/cookbooks/gitlab/recipes/nginx_spec.rb

@@ -921,6 +921,11 @@
           expect(content).to include('proxy_redirect ~^//(.*)\.(pages\.localhost)/(.*)$ /$1/$3;')
           expect(content).to include('proxy_redirect ~^/(.*)$ /$namespace/$1;')
           expect(content).to include('proxy_hide_header X-Gitlab-Namespace-In-Path;')
+          # Below checks are to verify proper render entries are made
+          expect(content).to include('proxy_http_version 1.1;').twice
+          expect(content).to include('proxy_pass').twice
+          expect(content).to include('disable_symlinks on;').twice
+          expect(content).to include('server_tokens off;').twice
         }
       end
     end
@@ -945,6 +950,11 @@
           expect(content).not_to include('proxy_redirect ~^//(.*)\.(pages\.localhost)/(.*)$ /$1/$3;')
           expect(content).not_to include('proxy_redirect ~^/(.*)$ /$namespace/$1;')
           expect(content).to include('proxy_hide_header X-Gitlab-Namespace-In-Path;')
+          # Below checks are to verify proper render entries are made
+          expect(content).to include('proxy_http_version 1.1;').once
+          expect(content).to include('proxy_pass').once
+          expect(content).to include('disable_symlinks on;').once
+          expect(content).to include('server_tokens off;').once
         }
       end
     end