apache: fix docroot; update log path

diff --git a/gitlab-apache-conf b/gitlab-apache-conf
index 826c509ced3684e13646496c6a047be0dd1e5338..c01503daacf4ebbbfc19202cc67cc31d5f7f2100 100644 (file)
--- a/gitlab-apache-conf
+++ b/gitlab-apache-conf
@@ -19,26 +19,26 @@
     ProxyPassReverse http://gitlab.openmamba.org/
   </Location>
 
-  #apache equivalent of nginx try files
+  # 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]
 
-  # needed for downloading attachments
-  DocumentRoot /var/lib/gitlab/www/public
+  # Needed for downloading attachments
+  DocumentRoot /var/lib/gitlab/public
 
-  #Set up apache error documents, if back end goes down (i.e. 503 error) then a maintenance/deploy page is thrown up.
+  # 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
   ErrorDocument 422 /422.html
   ErrorDocument 500 /500.html
   ErrorDocument 503 /deploy.html
 
   LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b" common_forwarded
-  ErrorLog  /var/log/httpd/gitlab.example.com_error.log
-  CustomLog /var/log/httpd/gitlab.example.com_forwarded.log common_forwarded
-  CustomLog /var/log/httpd/gitlab.example.com_access.log combined env=!dontlog
-  CustomLog /var/log/httpd/gitlab.example.com.log combined
+  ErrorLog  /var/log/httpd/gitlab_error.log
+  CustomLog /var/log/httpd/gitlab_forwarded.log common_forwarded
+  CustomLog /var/log/httpd/gitlab_access.log combined env=!dontlog
+  CustomLog /var/log/httpd/gitlab.log combined
 
 </VirtualHost>