Nginx configuration files remain in old paths that was once used

Summary

In 18.5, !8687 (merged) was released.

This has changed the Nginx configuration path, but on GitLab instances upgraded from older versions, configuration files remain at the old path.

Steps to reproduce

  1. Spin up GitLab 18.4
  2. Run sudo ls -la /var/opt/gitlab/nginx/conf/
  3. Upgrade it to 18.5
  4. Run the following commands
    1. sudo ls -la /var/opt/gitlab/nginx/conf/
    2. sudo ls -la /var/opt/gitlab/nginx/conf/service_conf/

Example in "2":

ubuntu@ip-172-31-22-120:~$ sudo ls -la /var/opt/gitlab/nginx/conf/
total 32
drwxr-x---  2 root gitlab-www 4096 Nov 17 10:59 .
drwxr-x--- 10 root gitlab-www 4096 Nov 17 11:01 ..
-rw-r--r--  1 root root        980 Nov 17 10:59 gitlab-health.conf
-rw-r--r--  1 root root       6656 Nov 17 10:59 gitlab-http.conf
-rw-r--r--  1 root root       2298 Nov 17 10:59 gitlab-registry.conf
-rw-r--r--  1 root root        633 Nov 17 10:59 nginx-status.conf
-rw-r--r--  1 root root       3754 Nov 17 10:59 nginx.conf

Example in "4":

ubuntu@ip-172-31-22-120:~$ sudo ls -la /var/opt/gitlab/nginx/conf/
total 32
drwxr-x---  5 root gitlab-www 4096 Nov 17 11:11 .
drwxr-x--- 10 root gitlab-www 4096 Nov 17 11:11 ..
drwxr-x---  2 root gitlab-www 4096 Nov 17 11:11 extra_metrics_conf
-rw-r--r--  1 root root        980 Nov 17 10:59 gitlab-health.conf <- old conf file
-rw-r--r--  1 root root        444 Nov 17 11:11 nginx-status.conf
-rw-r--r--  1 root root       3606 Nov 17 11:11 nginx.conf
drwxr-x---  2 root gitlab-www 4096 Nov 17 11:11 service_conf
drwxr-x---  2 root gitlab-www 4096 Nov 17 11:11 upstream_definitions
ubuntu@ip-172-31-22-120:~$ sudo ls -la /var/opt/gitlab/nginx/conf/service_conf
total 24
drwxr-x--- 2 root gitlab-www 4096 Nov 17 11:11 .
drwxr-x--- 5 root gitlab-www 4096 Nov 17 11:11 ..
-rw-r--r-- 1 root root        980 Nov 17 11:11 gitlab-health.partial
-rw-r--r-- 1 root root       6718 Nov 17 11:11 gitlab-rails.conf
-rw-r--r-- 1 root root       2298 Nov 17 11:11 gitlab-registry.conf
ubuntu@ip-172-31-22-120:~$ 

What is the current bug behavior?

Nginx configurations are exist in the both new and old paths.

What is the expected correct behavior?

Nginx configurations exist in the old paths are removed

Relevant logs

Relevant logs
N/A

Details of package version

Provide the package version installation details

**ubuntu@ip-172-31-22-120**:**\~**$ dpkg-query -l "gitlab-\*"

Desired=Unknown/Install/Remove/Purge/Hold

| Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend

|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)

||/ Name           Version      Architecture Description

+++-==============-============-============-============================================================

un  gitlab-ce      \       \       (no description available)

ii  gitlab-ee      18.5.2-ee.0  amd64        GitLab Enterprise Edition (including NGINX, Postgres, Redis)

un  gitlab-fips    \       \       (no description available)