Merge pull request #977 from hgomez/master

Update apache.conf

Author: dmp42

contrib/apache.conf

@@ -11,6 +11,11 @@
 
         ProxyRequests     off
         ProxyPreserveHost on
+
+        # Some HTTPd came configured with /error for error messages
+        # In this case, you should disable proxying to remote docker-registry
+        # ProxyPass /error/ !
+        
         ProxyPass         / http://127.0.0.1:5000/
         ProxyPassReverse  / http://127.0.0.1:5000/
 
@@ -34,5 +39,11 @@
                 Allow from all
         </Location>
 
+        # Allow ping and users to run unauthenticated.
+        <Location /_ping>
+               Satisfy any
+               Allow from all
+        </Location>
+
 </VirtualHost>