diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 6d9cc56abb..52ba52dce6 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [Contact Email Address](https://kolide.com/contact). The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by [contacting the Fleet team](hello@fleetdm.com). The team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff9a63f516..cb93f39157 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,5 +9,5 @@ When filing an issue, make sure to answer these five questions: 5. What happened instead? Sensitive security-related issues should be reported to -[security@kolide.co](mailto:security@kolide.co) before a public issue is made. +[security@fleetdm.com](mailto:security@fleetdm.com) before a public issue is made. diff --git a/cmd/fleet/main.go b/cmd/fleet/main.go index 3f99832ca3..fd980063ee 100644 --- a/cmd/fleet/main.go +++ b/cmd/fleet/main.go @@ -6,8 +6,8 @@ import ( "os" "time" - _ "github.com/go-sql-driver/mysql" "github.com/fleetdm/fleet/server/config" + _ "github.com/go-sql-driver/mysql" "github.com/spf13/cobra" ) @@ -42,7 +42,7 @@ func createRootCmd() *cobra.Command { var rootCmd = &cobra.Command{ Use: "fleet", Short: "osquery management and orchestration", - Long: `Kolide Fleet (https://kolide.com/fleet) + Long: `Fleet server (https://fleetdm.com) Configurable Options: diff --git a/cmd/fleetctl/fleetctl.go b/cmd/fleetctl/fleetctl.go index aa6cd31ad0..9b9110ca70 100644 --- a/cmd/fleetctl/fleetctl.go +++ b/cmd/fleetctl/fleetctl.go @@ -19,7 +19,7 @@ func init() { func main() { app := cli.NewApp() app.Name = "fleetctl" - app.Usage = "CLI for operating Kolide Fleet" + app.Usage = "CLI for operating Fleet" app.Version = version.Version().Version cli.VersionPrinter = func(c *cli.Context) { version.PrintFull() diff --git a/docs/infrastructure/configuring-the-fleet-binary.md b/docs/infrastructure/configuring-the-fleet-binary.md index c6c690f399..a1b677e167 100644 --- a/docs/infrastructure/configuring-the-fleet-binary.md +++ b/docs/infrastructure/configuring-the-fleet-binary.md @@ -10,7 +10,7 @@ To get the most out of running the Fleet server, it is helpful to establish a mu Your Fleet server's two main purposes are: - To serve as your [osquery TLS server](https://osquery.readthedocs.io/en/stable/deployment/remote/) -- To serve the [Fleet web application](https://kolide.com/fleet), which allows you to manage osquery configuration, query hosts, perform interesting analytics, etc. +- To serve the Fleet web UI, which allows you to manage osquery configuration, query hosts, etc. The Fleet server allows you persist configuration, manage users, etc. Thus, it needs a database. Fleet uses MySQL and requires you to supply configurations to connect to a MySQL server. Fleet also uses Redis to perform some more high-speed data access action throughout the lifecycle of the application (for example, distributed query result ingestion). Thus, Fleet also requires that you supply Redis connention configurations. diff --git a/server/mail/templates/change_email_confirmation.html b/server/mail/templates/change_email_confirmation.html index 92ed0b8faf..4f9935686a 100644 --- a/server/mail/templates/change_email_confirmation.html +++ b/server/mail/templates/change_email_confirmation.html @@ -70,7 +70,7 @@ Fleet Documentation - + diff --git a/server/mail/templates/invite_token.html b/server/mail/templates/invite_token.html index dbddb8086e..9069f10233 100644 --- a/server/mail/templates/invite_token.html +++ b/server/mail/templates/invite_token.html @@ -74,7 +74,7 @@ Fleet Documentation - + diff --git a/server/mail/templates/password_reset.html b/server/mail/templates/password_reset.html index 8ec0ff40a9..c72172f4ee 100644 --- a/server/mail/templates/password_reset.html +++ b/server/mail/templates/password_reset.html @@ -64,7 +64,7 @@ Fleet Documentation - + diff --git a/server/mail/templates/smtp_setup.html b/server/mail/templates/smtp_setup.html index b1418395d7..b96ec74f74 100644 --- a/server/mail/templates/smtp_setup.html +++ b/server/mail/templates/smtp_setup.html @@ -62,7 +62,7 @@ Fleet Documentation - +