From 29410935c8b5ca9faa9288109bccba1bae95a605 Mon Sep 17 00:00:00 2001 From: semiosis Date: Thu, 3 Oct 2013 20:33:25 -0400 Subject: [PATCH] Updated with suggestions from sag47 Made changes as per comments by @sag47 - Added ProxyPassReverse http://127.0.0.1:8080 Though I'm not sure what that's for. - Simplified regex in rewriterule - Put back in comments with links to external docs (nginx try) --- web-server/apache/gitlab-ssl.conf | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/web-server/apache/gitlab-ssl.conf b/web-server/apache/gitlab-ssl.conf index 58d5f24..ff17c12 100644 --- a/web-server/apache/gitlab-ssl.conf +++ b/web-server/apache/gitlab-ssl.conf @@ -30,11 +30,21 @@ ServerSignature Off ProxyPreserveHost On - ProxyPassReverse / http://gitlab.example.com/ + + 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 ^/(.*)$ http://127.0.0.1:8080%{REQUEST_URI} [P,QSA] + RewriteRule (.*) http://127.0.0.1:8080%1 [P,QSA] # needed for downloading attachments DocumentRoot /home/git/gitlab/public @@ -45,11 +55,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