commit d440404cf31d66e170f7bb15463fc4aa4ce50b94
Author: Elan Ruusamäe <[email protected]>
Date: Thu Oct 20 00:20:18 2016 +0300
reformat apache config with tabs
apache.conf | 70 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 34 insertions(+), 36 deletions(-)
---
diff --git a/apache.conf b/apache.conf
index bee5351..332225a 100644
--- a/apache.conf
+++ b/apache.conf
@@ -5,40 +5,38 @@
# mod_proxy
# mod_proxy_http
<VirtualHost *:80>
- ServerName gitlab.example.org
- ServerSignature Off
-
- ProxyPreserveHost On
-
- <Location />
- # New authorization commands for apache 2.4 and up
- # http://httpd.apache.org/docs/2.4/upgrading.html#access
- Require all granted
-
- ProxyPassReverse http://127.0.0.1:8080
- ProxyPassReverse http://gitlab.example.org/
- </Location>
-
- # 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 /usr/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.
- 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_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
-
+ ServerName gitlab.example.org
+ ServerSignature Off
+ ProxyPreserveHost On
+
+ <Location />
+ # New authorization commands for apache 2.4 and up
+ # http://httpd.apache.org/docs/2.4/upgrading.html#access
+ Require all granted
+
+ ProxyPassReverse http://127.0.0.1:8080
+ ProxyPassReverse http://gitlab.example.org/
+ </Location>
+
+ # 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 /usr/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.
+ 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_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>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/d440404cf31d66e170f7bb15463fc4aa4ce50b94
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
