Fix typos and wrong listen_addr for gitlab-workhorse

web-server/apache/README.md

@@ -17,22 +17,15 @@ To allow `gitlab-workhorse` to listen on port 8181, edit or create
 `/etc/default/gitlab` and change or add the following:
 ```
-gitlab_workhorse_options="-listenUmask 0 -listenNetwork tcp -listenAddr http://127.0.01:8181 -authBackend http://127.0.0.1:8080"
+gitlab_workhorse_options="-listenUmask 0 -listenNetwork tcp -listenAddr 127.0.0.1:8181 -authBackend http://127.0.0.1:8080"
 ```
 ## Installations unsing the Omnibus packages
-[Omnibus packages][] use their own bundled nginx server. If you want to use your
-own external Nginx server, follow the 4 steps to
-[configure GitLab][omnibuswebext] and then download the appropriate config file
-from this directory which has `omnibus` in its name.
-Usually the location where Apache reads its configs from, is either
-`/etc/apache2/sites-enabled/` (Debian/Ubuntu) or `/etc/httpd/conf.d/` (RHEL/CentOS).
-
-If you are using Debian, the de facto way is to store the configs in
-`/etc/apache2/sites-available/` and then make a symlink to
-`/etc/apache2/sites-enabled/` using the `a2ensite` command.
+[Omnibus packages][] use their own bundled Nginx server. If you want to use your
+own external Apache server, follow the steps to [configure GitLab][omnibuswebext].
+In the last step you will need to download the config from this repository.
 # RHEL6/CentOS6 recommendations

web-server/apache/gitlab-apache22.conf

 # This configuration has been tested on GitLab 8.1
 # Note this config assumes unicorn is listening on default port 8080 and gitlab-workhorse is listening on port 8181.
 # To allow gitlab-workhorse to listen on port 8181, edit or create /etc/default/gitlab and change or add the following:
-# gitlab_workhorse_options="-listenUmask 0 -listenNetwork tcp -listenAddr http://127.0.0.1:8181 -authBackend http://127.0.0.1:8080"
+# gitlab_workhorse_options="-listenUmask 0 -listenNetwork tcp -listenAddr 127.0.0.1:8181 -authBackend http://127.0.0.1:8080"
 #Module dependencies
 #  mod_rewrite
@@ -45,7 +45,7 @@
   RewriteRule .* http://127.0.0.1:8080%{REQUEST_URI} [P,QSA,NE]
   # needed for downloading attachments
-  DocumentRoot /opt/gitlab/embedded/service/gitlab-rails/public
+  DocumentRoot /home/git/gitlab/public
   #Set up apache error documents, if back end goes down (i.e. 503 error) then a maintenance/deploy page is thrown up.
   ErrorDocument 404 /404.html

web-server/apache/gitlab-apache24.conf

 # This configuration has been tested on GitLab 8.0.0
-# Note this config assumes unicorn is listening on default port 8080 and gitlab-git-http-server is listening on port 8181.
-# To allow gitlab-git-http-server to listen on port 8181, edit or create /etc/default/gitlab and change or add the following:
-# gitlab_git_http_server_options="-listenUmask 0 -listenNetwork tcp -listenAddr localhost:8181 -authBackend http://127.0.0.1:8080"
+# Note this config assumes unicorn is listening on default port 8080 and gitlab-workhorse is listening on port 8181.
+# To allow gitlab-workhorse to listen on port 8181, edit or create /etc/default/gitlab and change or add the following:
+# gitlab_workhorse_options="-listenUmask 0 -listenNetwork tcp -listenAddr 127.0.0.1:8181 -authBackend http://127.0.0.1:8080"
 #Module dependencies
 #  mod_rewrite
@@ -22,7 +22,7 @@
     # http://httpd.apache.org/docs/2.4/upgrading.html#access
     Require all granted
-    #Allow forwarding to gitlab-git-http-server
+    #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
@@ -33,7 +33,7 @@
   # http://serverfault.com/questions/290784/what-is-apaches-equivalent-of-nginxs-try-files
   # http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
   RewriteEngine on
-  #Forward these requests to gitlab-git-http-server
+  #Forward these requests to gitlab-workhorse
   RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/repository/archive.* [OR]
   RewriteCond %{REQUEST_URI} ^/api/v3/projects/.*/repository/archive.* [OR]
   RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$

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

@@ -4,7 +4,7 @@
 # listen on port 8181, edit /etc/gitlab/gitlab.rb and change the following:
 #
 # gitlab_workhorse['listen_network'] = "tcp"
-# gitlab_workhorse['listen_addr'] = "http://127.0.0.1:8181"
+# gitlab_workhorse['listen_addr'] = "127.0.0.1:8181"
 #
 #Module dependencies
 #  mod_rewrite

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

@@ -4,7 +4,7 @@
 # listen on port 8181, edit /etc/gitlab/gitlab.rb and change the following:
 #
 # gitlab_workhorse['listen_network'] = "tcp"
-# gitlab_workhorse['listen_addr'] = "http://127.0.0.1:8181"
+# gitlab_workhorse['listen_addr'] = "127.0.0.1:8181"
 #
 #Module dependencies
 #  mod_rewrite

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

 # This configuration has been tested on GitLab 8.1
-# Note this config assumes unicorn is listening on default port 8080 and gitlab-git-http-server is listening on port 8181.
-# To allow gitlab-git-http-server to listen on port 8181, edit or create /etc/default/gitlab and change or add the following:
-# gitlab_git_http_server_options="-listenUmask 0 -listenNetwork tcp -listenAddr localhost:8181 -authBackend http://127.0.0.1:8080"
+# Note this config assumes unicorn is listening on default port 8080 and gitlab-workhorse is listening on port 8181.
+# To allow gitlab-workhorse to listen on port 8181, edit or create /etc/default/gitlab and change or add the following:
+# gitlab_workhorse_options="-listenUmask 0 -listenNetwork tcp -listenAddr 127.0.0.1:8181 -authBackend http://127.0.0.1:8080"
 #Module dependencies
 # mod_rewrite
@@ -47,7 +47,7 @@
       Order deny,allow
       Allow from all
-      #Allow forwarding to gitlab-git-http-server
+      #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
@@ -59,7 +59,7 @@
   # http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
   RewriteEngine on
-  #Forward these requests to gitlab-git-http-server
+  #Forward these requests to gitlab-workhorse
   RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/repository/archive.* [OR]
   RewriteCond %{REQUEST_URI} ^/api/v3/projects/.*/repository/archive.* [OR]
   RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$

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

 # This configuration has been tested on GitLab 8.1
-# Note this config assumes unicorn is listening on default port 8080 and gitlab-git-http-server is listening on port 8181.
-# To allow gitlab-git-http-server to listen on port 8181, edit or create /etc/default/gitlab and change or add the following:
-# gitlab_git_http_server_options="-listenUmask 0 -listenNetwork tcp -listenAddr localhost:8181 -authBackend http://127.0.0.1:8080"
+# Note this config assumes unicorn is listening on default port 8080 and gitlab-workhorse is listening on port 8181.
+# To allow gitlab-workhorse to listen on port 8181, edit or create /etc/default/gitlab and change or add the following:
+# gitlab_workhorse_options="-listenUmask 0 -listenNetwork tcp -listenAddr 127.0.0.1:8181 -authBackend http://127.0.0.1:8080"
 #Module dependencies
 # mod_rewrite
@@ -48,7 +48,7 @@
     # http://httpd.apache.org/docs/2.4/upgrading.html#access
     Require all granted
-    #Allow forwarding to gitlab-git-http-server
+    #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
@@ -60,7 +60,7 @@
   # http://stackoverflow.com/questions/10954516/apache2-proxypass-for-rails-app-gitlab
   RewriteEngine on
-  #Forward these requests to gitlab-git-http-server
+  #Forward these requests to gitlab-workhorse
   RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/repository/archive.* [OR]
   RewriteCond %{REQUEST_URI} ^/api/v3/projects/.*/repository/archive.* [OR]
   RewriteCond %{REQUEST_URI} ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$

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

@@ -4,7 +4,7 @@
 # listen on port 8181, edit /etc/gitlab/gitlab.rb and change the following:
 #
 # gitlab_workhorse['listen_network'] = "tcp"
-# gitlab_workhorse['listen_addr'] = "http://127.0.0.1:8181"
+# gitlab_workhorse['listen_addr'] = "127.0.0.1:8181"
 #
 #Module dependencies
 # mod_rewrite

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

@@ -4,7 +4,7 @@
 # listen on port 8181, edit /etc/gitlab/gitlab.rb and change the following:
 #
 # gitlab_workhorse['listen_network'] = "tcp"
-# gitlab_workhorse['listen_addr'] = "http://127.0.0.1:8181"
+# gitlab_workhorse['listen_addr'] = "127.0.0.1:8181"
 #
 #Module dependencies
 # mod_rewrite