Merge branch 'master' into try-gookikt-config

2021-11-11 13:04:38 +01:00
parent 52d55390ab 45c3b072fb
commit 9b8c3838e8
39 changed files with 1139 additions and 793 deletions
@@ -7,12 +7,18 @@
            "request": "launch",
            "mode": "debug",
            "program": "${workspaceFolder}/ocis/cmd/ocis",
-            "args": ["server"],
+            "args": [
+                "server"
+            ],
            "env": {
+                // log settings for human developers
                "OCIS_LOG_LEVEL": "debug",
                "OCIS_LOG_PRETTY": "true",
                "OCIS_LOG_COLOR": "true",
-                "PROXY_ENABLE_BASIC_AUTH": "true"
+                // enable basic auth for dev setup so that we can use curl for testing
+                "PROXY_ENABLE_BASIC_AUTH": "true",
+                // set insecure options because we don't have valid certificates in dev environments
+                "OCIS_INSECURE": "true",
            }
        }
    ]