diff --git a/web-server/apache/gitlab.conf b/web-server/apache/gitlab.conf index 98eac76..1298f10 100644 --- a/web-server/apache/gitlab.conf +++ b/web-server/apache/gitlab.conf @@ -3,28 +3,27 @@ #Module dependencies # mod_rewrite # mod_proxy -# mod_proxy_balancer # mod_proxy_http ServerName gitlab.example.com ServerSignature Off + ProxyPreserveHost On + + + Order deny,allow + Allow from all + + ProxyPassReverse http://127.0.0.1:8080 + ProxyPassReverse http://gitlab.example.com/ + + #apache equivalent of nginx try files # 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 RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f - RewriteRule ^/(.*)$ balancer://unicornservers%{REQUEST_URI} [P,QSA,L] - - ProxyPreserveHost On - ProxyPass /uploads ! - ProxyPass /error ! - - - BalancerMember http://127.0.0.1:8080 - ProxyPassReverse http://127.0.0.1:8080 - ProxyPassReverse http://gitlab.example.com:8080 - + RewriteRule .* http://127.0.0.1:8080%{REQUEST_URI} [P,QSA] # needed for downloading attachments DocumentRoot /home/git/gitlab/public @@ -35,11 +34,6 @@ ErrorDocument 500 /500.html ErrorDocument 503 /deploy.html - - Order deny,allow - Allow from all - - LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b" common_forwarded ErrorLog /var/log/httpd/logs/gitlab.example.com_error.log CustomLog /var/log/httpd/logs/gitlab.example.com_forwarded.log common_forwarded