diff options
Diffstat (limited to 'apache.conf.example')
| -rw-r--r-- | apache.conf.example | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/apache.conf.example b/apache.conf.example index 3f16675cca17..19580489e68c 100644 --- a/apache.conf.example +++ b/apache.conf.example @@ -4,17 +4,18 @@ # mod_proxy # mod_proxy_http <VirtualHost *:80> - ServerName gitlabci.example.com + ServerName gitlab.example.com ServerSignature Off ProxyPreserveHost On <Location /> - Order deny,allow - Allow from all + # 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:8081 - ProxyPassReverse http://gitlabci.example.com/ + ProxyPassReverse http://gitlab.example.com/ </Location> #apache equivalent of nginx try files @@ -34,8 +35,8 @@ ErrorDocument 503 /deploy.html LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b" common_forwarded - ErrorLog /var/log/httpd/logs/gitlabci.example.com_error.log - CustomLog /var/log/httpd/logs/gitlabci.example.com_forwarded.log common_forwarded - CustomLog /var/log/httpd/logs/gitlabci.example.com_access.log combined env=!dontlog - CustomLog /var/log/httpd/logs/gitlabci.example.com.log combined + ErrorLog /var/log/httpd/logs/gitlab.example.com_error.log + CustomLog /var/log/httpd/logs/gitlab.example.com_forwarded.log common_forwarded + CustomLog /var/log/httpd/logs/gitlab.example.com_access.log combined env=!dontlog + CustomLog /var/log/httpd/logs/gitlab.example.com.log combined </VirtualHost> |