Merge remote-tracking branch 'upstream/phase4-11-07-2015' into python-registry-v2

conf/init/service/diffsworker/log/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -i -t diffsworker

conf/init/service/diffsworker/run

@@ -1,8 +0,0 @@
-#! /bin/bash
-
-echo 'Starting diffs worker'
-
-cd /
-venv/bin/python -m workers.diffsworker
-
-echo 'Diffs worker exited'

conf/init/service/securityworker/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -i -t securityworker

conf/init/service/securityworker/run

@@ -0,0 +1,8 @@
+#! /bin/bash
+
+echo 'Starting security scanner worker'
+
+cd /
+venv/bin/python -m workers.securityworker 2>&1
+
+echo 'Security scanner worker exited'

conf/server-base.conf

@@ -64,6 +64,27 @@ location ~ ^/(v1|v2)/  {
     client_max_body_size 20G;
 }
 
+location /v1/_ping {
+    add_header Content-Type text/plain;
+    add_header X-Docker-Registry-Version 0.6.0;
+    add_header X-Docker-Registry-Standalone 0;
+    return 200 'true';
+}
+
+location /v2/ {
+    proxy_buffering off;
+
+    proxy_request_buffering off;
+
+    proxy_http_version 1.1;
+    proxy_set_header Connection "";
+
+    proxy_pass   http://registry_app_server;
+    proxy_temp_path /tmp 1 2;
+
+    client_max_body_size 20G;
+}
+
 location /c1/ {
     proxy_buffering off;
 
@@ -77,14 +98,8 @@ location /c1/ {
 
 location /static/ {
     # checks for static file, if not found proxy to app
-    alias /static/;
-}
-
-location /v1/_ping {
-    add_header Content-Type text/plain;
-    add_header X-Docker-Registry-Version 0.6.0;
-    add_header X-Docker-Registry-Standalone 0;
-    return 200 'true';
+    alias      /static/;
+    error_page 404 /404;
 }
 
 location ~ ^/b1/controller(/?)(.*) {