summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Blanchard <martin.blanchard@codethink.co.uk>2019-02-26 11:56:36 +0000
committerMartin Blanchard <martin.blanchard@codethink.co.uk>2019-02-28 09:25:17 +0000
commitaef73c9098cfd8d0d0fdcf3231bfbbaa5913450d (patch)
tree29facffa648816e557bd3591c936ac45a7cb269b
parent7a8a0a1e666da4f831158a80046ca91748080aa7 (diff)
downloadbuildstream-aef73c9098cfd8d0d0fdcf3231bfbbaa5913450d.tar.gz
doc: Show a non-TLS remote-execution config. example
https://gitlab.com/BuildStream/buildstream/issues/799
-rw-r--r--doc/source/format_project.rst3
-rw-r--r--doc/source/using_config.rst5
2 files changed, 2 insertions, 6 deletions
diff --git a/doc/source/format_project.rst b/doc/source/format_project.rst
index 529816176..a2216100f 100644
--- a/doc/source/format_project.rst
+++ b/doc/source/format_project.rst
@@ -255,8 +255,7 @@ optional for remote execution to work.
The storage service may be the same endpoint used for artifact
caching. Remote execution cannot work without push access to the
-storage endpoint, so you must specify a client certificate and key,
-and a server certificate.
+storage endpoint though.
Instance name is optional. Instance names separate different shards on
the same endpoint (url). You can supply a different instance name for
diff --git a/doc/source/using_config.rst b/doc/source/using_config.rst
index a7ee4dca9..40b763e78 100644
--- a/doc/source/using_config.rst
+++ b/doc/source/using_config.rst
@@ -142,10 +142,7 @@ configuration will be used as fallback.
url: http://execution.some_project.example.com:50051
instance-name: main
storage-service:
- url: https://storage.some_project.example.com:11002
- server-cert: /some_project_keys/server.crt
- client-cert: /some_project_keys/client.crt
- client-key: /some_project_keys/client.key
+ url: http://storage.some_project.example.com:11002
instance-name: main
action-cache-service:
url: http://cache.some_project.example.com:50052