Merge branch 'master' into try-gookikt-config

deployments/examples/cs3_users_ocis/config/ocis/proxy.json

@@ -65,6 +65,10 @@
           "endpoint": "/app/",
           "backend": "http://localhost:9140"
         },
+        {
+          "endpoint": "/archiver",
+          "backend": "http://localhost:9140"
+        },
         {
           "endpoint": "/data",
           "backend": "http://localhost:9140"
@@ -88,4 +92,4 @@
       ]
     }
   ]
-}
+}

deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json

@@ -1,4 +1,7 @@
 {
+  "log": {
+    "level": "PROXY_LOG_LEVEL"
+  },
   "policy_selector": {
     "claims": {
       "default_policy": "oc10",
@@ -52,8 +55,12 @@
           "backend": "http://localhost:9140"
         },
         {
-          "endpoint": "/app/",
-          "backend": "http://localhost:9140"
+          "endpoint": "/index.php/login",
+          "backend": "http://localhost:9100"
+        },
+        {
+          "endpoint": "/login",
+          "backend": "http://localhost:9100"
         },
         {
           "endpoint": "/data",
@@ -63,6 +70,14 @@
           "endpoint": "/graph/",
           "backend": "http://localhost:9120"
         },
+        {
+          "endpoint": "/app/",
+          "backend": "http://localhost:9140"
+        },
+        {
+          "endpoint": "/archiver",
+          "backend": "http://localhost:9140"
+        },
         {
           "endpoint": "/graph-explorer/",
           "backend": "http://localhost:9135"

deployments/examples/ocis_hello/config/ocis/proxy.json

@@ -65,6 +65,14 @@
           "endpoint": "/data",
           "backend": "http://localhost:9140"
         },
+        {
+          "endpoint": "/app/",
+          "backend": "http://localhost:9140"
+        },
+        {
+          "endpoint": "/archiver",
+          "backend": "http://localhost:9140"
+        },
         {
           "endpoint": "/graph/",
           "backend": "http://localhost:9120"
@@ -100,4 +108,4 @@
       ]
     }
   ]
-}
+}