Update to forward everything to GitLab workhorse

web-server/apache/README.md

 # Apache 2 version
-The configuration files in this directory are known to work  with GitLab 8.2
+The configuration files in this directory are known to work  with GitLab 8.3
 and newer versions.
+Fir versions of GitLab 8.2, check the `stable-8-2` branch.
 For versions of GitLab 8.0 and 8.1, check the `stable-8-1` branch.
 For versions of GitLab older than 8.0, check the `apache-old` branch.

web-server/apache/gitlab-apache22.conf

@@ -25,8 +25,6 @@
     #Allow forwarding to gitlab-workhorse
     ProxyPassReverse http://127.0.0.1:8181
-    #Allow forwarding to GitLab Rails app (Unicorn)
-    ProxyPassReverse http://127.0.0.1:8080
     ProxyPassReverse http://YOUR_SERVER_FQDN/
   </Location>
@@ -35,20 +33,9 @@
   # http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
   RewriteEngine on
-  #Forward these requests to gitlab-workhorse
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/builds/download.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/api/v3/projects/.*/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/ci/api/v1/builds/[0-9]+/artifacts.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$
+  #Forward all requests to gitlab-workhorse
   RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
-  #Forward any other requests to GitLab Rails app (Unicorn)
-  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
-  RewriteCond %{REQUEST_URI} ^/uploads
-  RewriteRule .* http://127.0.0.1:8080%{REQUEST_URI} [P,QSA,NE]
-
   # needed for downloading attachments
   DocumentRoot /home/git/gitlab/public

web-server/apache/gitlab-apache24.conf

@@ -26,8 +26,6 @@
     #Allow forwarding to gitlab-workhorse
     ProxyPassReverse http://127.0.0.1:8181
-    #Allow forwarding to GitLab Rails app (Unicorn)
-    ProxyPassReverse http://127.0.0.1:8080
     ProxyPassReverse http://YOUR_SERVER_FQDN/
   </Location>
@@ -36,20 +34,9 @@
   # http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
   RewriteEngine on
-  #Forward these requests to gitlab-workhorse
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/builds/download.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/api/v3/projects/.*/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/ci/api/v1/builds/[0-9]+/artifacts.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$
+  #Forward all requests to gitlab-workhorse
   RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
-  #Forward any other requests to GitLab Rails app (Unicorn)
-  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
-  RewriteCond %{REQUEST_URI} ^/uploads
-  RewriteRule .* http://127.0.0.1:8080%{REQUEST_URI} [P,QSA,NE]
-
   # needed for downloading attachments
   DocumentRoot /home/git/gitlab/public

web-server/apache/gitlab-omnibus-apache22.conf

@@ -26,8 +26,6 @@
     #Allow forwarding to gitlab-workhorse
     ProxyPassReverse http://127.0.0.1:8181
-    #Allow forwarding to GitLab Rails app (Unicorn)
-    ProxyPassReverse http://127.0.0.1:8080
     ProxyPassReverse http://YOUR_SERVER_FQDN/
   </Location>
@@ -36,20 +34,9 @@
   # http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
   RewriteEngine on
-  #Forward these requests to gitlab-workhorse
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/builds/download.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/api/v3/projects/.*/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/ci/api/v1/builds/[0-9]+/artifacts.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$
+  #Forward all requests to gitlab-workhorse
   RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
-  #Forward any other requests to GitLab Rails app (Unicorn)
-  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
-  RewriteCond %{REQUEST_URI} ^/uploads
-  RewriteRule .* http://127.0.0.1:8080%{REQUEST_URI} [P,QSA,NE]
-
   # needed for downloading attachments
   DocumentRoot /opt/gitlab/embedded/service/gitlab-rails/public

web-server/apache/gitlab-omnibus-apache24.conf

@@ -27,8 +27,6 @@
     #Allow forwarding to gitlab-workhorse
     ProxyPassReverse http://127.0.0.1:8181
-    #Allow forwarding to GitLab Rails app (Unicorn)
-    ProxyPassReverse http://127.0.0.1:8080
     ProxyPassReverse http://YOUR_SERVER_FQDN/
   </Location>
@@ -38,19 +36,8 @@
   RewriteEngine on
   #Forward these requests to gitlab-workhorse
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/builds/download.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/api/v3/projects/.*/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/ci/api/v1/builds/[0-9]+/artifacts.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$
   RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
-  #Forward any other requests to GitLab Rails app (Unicorn)
-  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
-  RewriteCond %{REQUEST_URI} ^/uploads
-  RewriteRule .* http://127.0.0.1:8080%{REQUEST_URI} [P,QSA,NE]
-
   # needed for downloading attachments
   DocumentRoot /opt/gitlab/embedded/service/gitlab-rails/public

web-server/apache/gitlab-omnibus-ssl-apache22.conf

@@ -52,8 +52,6 @@
     #Allow forwarding to gitlab-workhorse
     ProxyPassReverse http://127.0.0.1:8181
-    #Allow forwarding to GitLab Rails app (Unicorn)
-    ProxyPassReverse http://127.0.0.1:8080
     ProxyPassReverse http://YOUR_SERVER_FQDN/
   </Location>
@@ -62,19 +60,9 @@
   # http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
   RewriteEngine on
-  #Forward these requests to gitlab-workhorse
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/builds/download.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/api/v3/projects/.*/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/ci/api/v1/builds/[0-9]+/artifacts.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$
+  #Forward all requests to gitlab-workhorse
   RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
-  #Forward any other requests to GitLab Rails app (Unicorn)
-  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
-  RewriteCond %{REQUEST_URI} ^/uploads
-  RewriteRule .* http://127.0.0.1:8080%{REQUEST_URI} [P,QSA,NE]
   RequestHeader set X_FORWARDED_PROTO 'https'
   RequestHeader set X-Forwarded-Ssl on

web-server/apache/gitlab-omnibus-ssl-apache24.conf

@@ -53,8 +53,6 @@
     #Allow forwarding to gitlab-workhorse
     ProxyPassReverse http://127.0.0.1:8181
-    #Allow forwarding to GitLab Rails app (Unicorn)
-    ProxyPassReverse http://127.0.0.1:8080
     ProxyPassReverse http://YOUR_SERVER_FQDN/
   </Location>
@@ -63,19 +61,9 @@
   # http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
   RewriteEngine on
-  #Forward these requests to gitlab-workhorse
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/builds/download.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/api/v3/projects/.*/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/ci/api/v1/builds/[0-9]+/artifacts.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$
+  #Forward all requests to gitlab-workhorse
   RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
-  #Forward any other requests to GitLab Rails app (Unicorn)
-  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
-  RewriteCond %{REQUEST_URI} ^/uploads
-  RewriteRule .* http://127.0.0.1:8080%{REQUEST_URI} [P,QSA,NE]
   RequestHeader set X_FORWARDED_PROTO 'https'
   RequestHeader set X-Forwarded-Ssl on

web-server/apache/gitlab-ssl-apache22.conf

@@ -51,8 +51,6 @@
     #Allow forwarding to gitlab-workhorse
     ProxyPassReverse http://127.0.0.1:8181
-    #Allow forwarding to GitLab Rails app (Unicorn)
-    ProxyPassReverse http://127.0.0.1:8080
     ProxyPassReverse http://YOUR_SERVER_FQDN/
   </Location>
@@ -61,19 +59,9 @@
   # http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
   RewriteEngine on
-  #Forward these requests to gitlab-workhorse
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/builds/download.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/api/v3/projects/.*/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/ci/api/v1/builds/[0-9]+/artifacts.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$
+  #Forward all requests to gitlab-workhorse
   RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
-  #Forward any other requests to GitLab Rails app (Unicorn)
-  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
-  RewriteCond %{REQUEST_URI} ^/uploads
-  RewriteRule .* http://127.0.0.1:8080%{REQUEST_URI} [P,QSA,NE]
   RequestHeader set X_FORWARDED_PROTO 'https'
   RequestHeader set X-Forwarded-Ssl on

web-server/apache/gitlab-ssl-apache24.conf

@@ -52,8 +52,6 @@
     #Allow forwarding to gitlab-workhorse
     ProxyPassReverse http://127.0.0.1:8181
-    #Allow forwarding to GitLab Rails app (Unicorn)
-    ProxyPassReverse http://127.0.0.1:8080
     ProxyPassReverse http://YOUR_SERVER_FQDN/
   </Location>
@@ -62,19 +60,9 @@
   # http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
   RewriteEngine on
-  #Forward these requests to gitlab-workhorse
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/builds/download.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/api/v3/projects/.*/repository/archive.* [OR]
-  RewriteCond %{REQUEST_URI} ^/ci/api/v1/builds/[0-9]+/artifacts.* [OR]
-  RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$
+  #Forward all requests to gitlab-workhorse
   RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
-  #Forward any other requests to GitLab Rails app (Unicorn)
-  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
-  RewriteCond %{REQUEST_URI} ^/uploads
-  RewriteRule .* http://127.0.0.1:8080%{REQUEST_URI} [P,QSA,NE]
   RequestHeader set X_FORWARDED_PROTO 'https'
   RequestHeader set X-Forwarded-Ssl on