Merge pull request #564 from Precis/nginx_auth_exemption

Fix auth_basic exemption in nginx.conf sample

Author: shin-

contrib/nginx/docker-registry.conf

@@ -0,0 +1,5 @@
+proxy_pass                       http://docker-registry;
+proxy_set_header  Host           $http_host;   # required for docker client's sake
+proxy_set_header  X-Real-IP      $remote_addr; # pass on real client's IP
+proxy_set_header  Authorization  ""; # see https://github.com/dotcloud/docker-registry/issues/170
+proxy_read_timeout               900;

contrib/nginx.conf renamed to contrib/nginx/nginx.conf

@@ -24,10 +24,6 @@ server {
   ssl_certificate /etc/ssl/certs/docker-registry;
   ssl_certificate_key /etc/ssl/private/docker-registry;
 
-  proxy_set_header Host           $http_host;   # required for docker client's sake
-  proxy_set_header X-Real-IP      $remote_addr; # pass on real client's IP
-  proxy_set_header Authorization  ""; # see https://github.com/dotcloud/docker-registry/issues/170
-
   client_max_body_size 0; # disable any limits to avoid HTTP 413 for large image uploads
 
   # required to avoid HTTP 411: see Issue #1486 (https://github.com/dotcloud/docker/issues/1486)
@@ -38,19 +34,18 @@ server {
   }
 
   location / {
-    proxy_pass          http://docker-registry;
-    proxy_set_header    Host  $host;
-    proxy_read_timeout  900;
-
     auth_basic            "Restricted";
     auth_basic_user_file  docker-registry.htpasswd;
+    include               docker-registry.conf
   }
 
   location /_ping {
     auth_basic off;
+    include               docker-registry.conf
   }
 
   location /v1/_ping {
     auth_basic off;
+    include               docker-registry.conf
   }
 }

contrib/nginx_1-3-9.conf renamed to contrib/nginx/nginx_1-3-9.conf

@@ -22,29 +22,24 @@ server {
   ssl_certificate /etc/ssl/certs/docker-registry;
   ssl_certificate_key /etc/ssl/private/docker-registry;
 
-  proxy_set_header Host           $http_host;   # required for docker client's sake
-  proxy_set_header X-Real-IP      $remote_addr; # pass on real client's IP
-  proxy_set_header Authorization  ""; # see https://github.com/dotcloud/docker-registry/issues/170
-
   client_max_body_size 0; # disable any limits to avoid HTTP 413 for large image uploads
 
   # required to avoid HTTP 411: see Issue #1486 (https://github.com/dotcloud/docker/issues/1486)
   chunked_transfer_encoding on;
 
   location / {
-    proxy_pass          http://docker-registry;
-    proxy_set_header    Host  $host;
-    proxy_read_timeout  900;
-
     auth_basic            "Restricted";
     auth_basic_user_file  docker-registry.htpasswd;
+    include               docker-registry.conf
   }
 
   location /_ping {
     auth_basic off;
+    include               docker-registry.conf
   }
 
   location /v1/_ping {
     auth_basic off;
+    include               docker-registry.conf
   }
 }