Merge branch 'master' into docs-manage_ssl

web-server/apache/gitlab.conf

@@ -16,10 +16,12 @@
 </VirtualHost>
 <VirtualHost *:443>
   SSLEngine on
-  SSLCipherSuite ALL:!ADH:!EXP:!eNULL:!aNULL:RC4+RSA:+HIGH:-MEDIUM:!LOW:-SSLv2
+  #strong encryption ciphers only
+  #see ciphers(1) http://www.openssl.org/docs/apps/ciphers.html
+  SSLCipherSuite SSLv3:TLSv1:+HIGH:!SSLv2:!MD5:!MEDIUM:!LOW:!EXP:!ADH:!eNULL:!aNULL
   SSLCertificateFile    /etc/httpd/ssl.crt/gitlab.example.com.crt
   SSLCertificateKeyFile /etc/httpd/ssl.key/gitlab.example.com.key
-  SSLCACertificateFile  /etc/httpd/ssl.crt/incommon-ca.crt
+  SSLCACertificateFile  /etc/httpd/ssl.crt/your-ca.crt
 
   ServerName gitlab.example.com
   ServerSignature Off
@@ -44,6 +46,12 @@
   # needed for downloading attachments
   DocumentRoot /home/git/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
+
   <Location />
     Order deny,allow
     Allow from all