From fa9fba1e30014540b71a310423615da50097aa45 Mon Sep 17 00:00:00 2001 From: Mike McNeil <7157539-mikerlmcneil@users.noreply.gitlab.com> Date: Wed, 14 Oct 2020 16:58:29 +0000 Subject: [PATCH 1/4] Update adding-hosts-to-fleet.md --- docs/infrastructure/adding-hosts-to-fleet.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/infrastructure/adding-hosts-to-fleet.md b/docs/infrastructure/adding-hosts-to-fleet.md index 191ad264d0a..0513bd55956 100644 --- a/docs/infrastructure/adding-hosts-to-fleet.md +++ b/docs/infrastructure/adding-hosts-to-fleet.md @@ -18,20 +18,24 @@ We provide compiled releases of the launcher for all supported platforms. Those To directly execute the launcher binary without having to mess with packages, invoke the binary with just a few flags: -- `--hostname`: the hostname of the gRPC server for your environment -- `--root_directory`: the location of the local database, pidfiles, etc. +- `--hostname`: the hostname of Fleet (aka the gRPC server for your environment) +- `--root_directory`: the location for osquery's local database, pidfiles, etc. - `--enroll_secret`: the enroll secret to authenticate hosts with Fleet (retrieve from Fleet UI or `fleetctl get enroll_secret`) ``` +mkdir .osquery ./build/launcher \ --hostname=fleet.acme.net:443 \ - --root_directory=$(mktemp -d) \ + --root_directory=.osquery \ --enroll_secret=32IeN3QLgckHUmMD3iW40kyLdNJcGzP5 ``` You may also need to define the `--insecure` and/or `--insecure_grpc` flag. If you're running Fleet locally, include `--insecure` because your TLS certificate will not be signed by a valid CA. + + + #### Generating packages The Launcher also provides easy, robust tooling for creating packages that you can distribute across your fleet: From 39f784735173b338f154303fec4709760cd80dd2 Mon Sep 17 00:00:00 2001 From: Mike McNeil <7157539-mikerlmcneil@users.noreply.gitlab.com> Date: Wed, 14 Oct 2020 17:03:06 +0000 Subject: [PATCH 2/4] Update adding-hosts-to-fleet.md --- docs/infrastructure/adding-hosts-to-fleet.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/infrastructure/adding-hosts-to-fleet.md b/docs/infrastructure/adding-hosts-to-fleet.md index 0513bd55956..e00bff2fccc 100644 --- a/docs/infrastructure/adding-hosts-to-fleet.md +++ b/docs/infrastructure/adding-hosts-to-fleet.md @@ -31,10 +31,21 @@ mkdir .osquery --enroll_secret=32IeN3QLgckHUmMD3iW40kyLdNJcGzP5 ``` -You may also need to define the `--insecure` and/or `--insecure_grpc` flag. If you're running Fleet locally, include `--insecure` because your TLS certificate will not be signed by a valid CA. +You may also need to define the `--insecure` and/or `--insecure_grpc` flag. - + + + +If you're running Fleet locally, include `--insecure` because your TLS certificate will not be signed by a valid CA: +``` +mkdir .osquery +./build/launcher \ + --hostname=localhost:8412 \ + --root_directory=.osquery \ + --enroll_secret=32IeN3QLgckHUmMD3iW40kyLdNJcGzP5 + --insecure +``` #### Generating packages From e79bec0a997930c5f7669a42e28b1b5f4a9725fb Mon Sep 17 00:00:00 2001 From: Noah Talerman Date: Wed, 28 Oct 2020 19:06:01 -0700 Subject: [PATCH 3/4] Removed GOPATH instructions from building the code docs --- docs/development/building-the-code.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/development/building-the-code.md b/docs/development/building-the-code.md index 1e959c0c8d4..baed795acea 100644 --- a/docs/development/building-the-code.md +++ b/docs/development/building-the-code.md @@ -3,9 +3,7 @@ Building The Code ## Building the Code -Checkout this repository to `$GOPATH/src/github.com/kolide/fleet`. If you're new to Go and you don't know about `$GOPATH`, then check out the repo to `$HOME/go/src/github.com/kolide/fleet`. You will also need to install Go (1.9 or greater). - -* [Go Documentation: Workspaces](https://golang.org/doc/code.html#Workspaces) +Checkout this repository. To setup a working local development environment, you must install the following minimum toolset: From d528d865e1fef2748c0c4a3ddeca3d8d5b573ec0 Mon Sep 17 00:00:00 2001 From: Noah Talerman Date: Wed, 28 Oct 2020 19:07:17 -0700 Subject: [PATCH 4/4] Changed 'checkout' to 'clone' in messaging --- docs/development/building-the-code.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/development/building-the-code.md b/docs/development/building-the-code.md index baed795acea..7a0293b22d3 100644 --- a/docs/development/building-the-code.md +++ b/docs/development/building-the-code.md @@ -3,7 +3,7 @@ Building The Code ## Building the Code -Checkout this repository. +Clone this repository. To setup a working local development environment, you must install the following minimum toolset: