diff --git a/docs/Deploy/Deploy-Fleet-on-AWS-ECS.md b/docs/Deploy/Deploy-Fleet-on-AWS-ECS.md index 905c7b0a29..78c19f8d9b 100644 --- a/docs/Deploy/Deploy-Fleet-on-AWS-ECS.md +++ b/docs/Deploy/Deploy-Fleet-on-AWS-ECS.md @@ -1,4 +1,4 @@ -## Deploying Fleet on AWS ECS +## Deploy Fleet on AWS ECS Terraform reference architecture can be found [here](https://github.com/fleetdm/fleet/tree/main/infrastructure/dogfood/terraform/aws) @@ -22,7 +22,7 @@ Migrations in ECS can be achieved (and is recommended) by running [dedicated ECS Alternatively you can bake the prepare command into the same task definition see [here for a discussion](https://github.com/fleetdm/fleet/pull/1761#discussion_r697599457), but this not recommended for production environments. - + \ No newline at end of file diff --git a/docs/Deploy/Deploy-Fleet-on-CentOS.md b/docs/Deploy/Deploy-Fleet-on-CentOS.md index f5eb51ac29..c722769c53 100644 --- a/docs/Deploy/Deploy-Fleet-on-CentOS.md +++ b/docs/Deploy/Deploy-Fleet-on-CentOS.md @@ -1,4 +1,4 @@ -## Deploying Fleet on CentOS +## Deploy Fleet on CentOS In this guide, we're going to install Fleet and all of its application dependencies on a CentOS 7.1 server. Once we have Fleet up and running, we're going to install osquery on that same CentOS 7.1 host and enroll it in Fleet. This should give you a good understanding of both how to install Fleet as well as how to install and configure osquery such that it can communicate with Fleet. @@ -210,7 +210,7 @@ sudo /usr/bin/osqueryd \ If you go back to [https://localhost:8080/hosts/manage](https://localhost:8080/hosts/manage), you should have a host successfully enrolled in Fleet! - + diff --git a/docs/Deploy/Deploy-Fleet-on-Kubernetes.md b/docs/Deploy/Deploy-Fleet-on-Kubernetes.md index d65eb5d9e6..fb70356075 100644 --- a/docs/Deploy/Deploy-Fleet-on-Kubernetes.md +++ b/docs/Deploy/Deploy-Fleet-on-Kubernetes.md @@ -1,4 +1,4 @@ -## Deploying Fleet on Kubernetes +## Deploy Fleet on Kubernetes In this guide, we will focus on deploying Fleet only on a Kubernetes cluster. Kubernetes is a container orchestration tool that was open sourced by Google in 2014. @@ -242,7 +242,7 @@ In this output, you should see an "EXTERNAL-IP" column. If this column says ` + \ No newline at end of file diff --git a/articles/deploy-fleet-on-hetzner-cloud.md b/docs/Deploy/deploy-on-hetzner-cloud.md similarity index 94% rename from articles/deploy-fleet-on-hetzner-cloud.md rename to docs/Deploy/deploy-on-hetzner-cloud.md index f9c51d3b4a..28dd71b0d3 100644 --- a/articles/deploy-fleet-on-hetzner-cloud.md +++ b/docs/Deploy/deploy-on-hetzner-cloud.md @@ -1,12 +1,6 @@ -# Deploy Fleet on Hetzner Cloud with cloud-init and Docker +# Deploy Fleet on Hetzner Cloud -![Fleet + Hetzner](../website/assets/images/articles/deploying-fleet-on-hetzner-1600x900@2x.jpg) - -[Hetzner](https://hetzner.com) is a great price-performance provider for “root” (dedicated) and Virtual Private Servers (VPS) with high performance and generous bandwidth. - -While other providers may charge large amounts for computing and storage, Hetzner is cost-effective _and_ scalable, with great managed options (such as [Nextcloud](https://www.hetzner.com/storage/storage-share)). - -Let’s explore how you might deploy Fleet on [Hetzner Cloud](https://hetzner.com/cloud) as quickly as possible so you can use Fleet to orchestrate osquery on your endpoints. +Learn how to deploy Fleet on Hetzner Cloud using cloud-init and Docker. [Hetzner](https://hetzner.com) is a great price-performance provider for “root” (dedicated) and Virtual Private Servers (VPS), offering high performance and generous bandwidth. ## The 2 minute setup @@ -350,7 +344,7 @@ To follow this guide, you’ll need: First, purchase a machine (for example, a [Hetzner Cloud](https://hetzner.com/cloud) instance): -![Hetzner cloud purchase machine screen](../website/assets/images/articles/deploy-fleet-on-hetzner-cloud-1-932x388%402x.png) +![Hetzner cloud purchase machine screen](../docs/images/deploy-on-hetzner-cloud-1-932x388@2x.png) _Hetzner cloud purchase machine screen_ After purchasing, you should know the IP address of your machine (and make sure you set up things like SSH [securely](https://community.hetzner.com/tutorials/securing-ssh)!) @@ -707,9 +701,7 @@ Now that you’re ready to use Fleet and have a host installed. Here's some next - Import Fleet's [standard query library](https://fleetdm.com/docs/using-fleet/standard-query-library) to start asking questions about your hosts. - To run a more secure setup, consider creating a dedicated `fleet` user with Docker's support for user [namespaces](https://docs.docker.com/engine/security/userns-remap/). - - - - - - + + + + \ No newline at end of file diff --git a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-1-932x388@2x.png b/docs/images/deploy-fleet-on-hetzner-cloud-1-932x388@2x.png similarity index 100% rename from website/assets/images/articles/deploy-fleet-on-hetzner-cloud-1-932x388@2x.png rename to docs/images/deploy-fleet-on-hetzner-cloud-1-932x388@2x.png diff --git a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-2-774x453@2x.png b/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-2-774x453@2x.png deleted file mode 100644 index d1ea873192..0000000000 Binary files a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-2-774x453@2x.png and /dev/null differ diff --git a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-3-960x302@2x.png b/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-3-960x302@2x.png deleted file mode 100644 index a5e383f262..0000000000 Binary files a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-3-960x302@2x.png and /dev/null differ diff --git a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-4-960x281@2x.png b/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-4-960x281@2x.png deleted file mode 100644 index 3032e19f9e..0000000000 Binary files a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-4-960x281@2x.png and /dev/null differ diff --git a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-5-1400x860@2x.png b/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-5-1400x860@2x.png deleted file mode 100644 index d5277d6c5d..0000000000 Binary files a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-5-1400x860@2x.png and /dev/null differ diff --git a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-6-959x373@2x.png b/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-6-959x373@2x.png deleted file mode 100644 index f3d492f89c..0000000000 Binary files a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-6-959x373@2x.png and /dev/null differ diff --git a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-cover-800x450@2x.png b/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-cover-800x450@2x.png deleted file mode 100644 index ea4c85889e..0000000000 Binary files a/website/assets/images/articles/deploy-fleet-on-hetzner-cloud-cover-800x450@2x.png and /dev/null differ diff --git a/website/assets/images/articles/deploying-fleet-on-hetzner-1600x900@2x.jpg b/website/assets/images/articles/deploying-fleet-on-hetzner-1600x900@2x.jpg deleted file mode 100644 index a18610b35c..0000000000 Binary files a/website/assets/images/articles/deploying-fleet-on-hetzner-1600x900@2x.jpg and /dev/null differ diff --git a/website/assets/js/pages/articles/articles.page.js b/website/assets/js/pages/articles/articles.page.js index 40bc1f2c0a..cd20ea431b 100644 --- a/website/assets/js/pages/articles/articles.page.js +++ b/website/assets/js/pages/articles/articles.page.js @@ -47,10 +47,6 @@ parasails.registerPage('articles', { this.articleCategory = 'Announcements'; this.categoryDescription = 'The latest news from Fleet.'; break; - case 'deploy': - this.articleCategory = 'Deployment guides'; - this.categoryDescription = 'Learn more about how to deploy Fleet.'; - break; case 'podcasts': this.articleCategory = 'Podcasts'; this.categoryDescription = 'Listen to the Future of Device Management podcast'; diff --git a/website/config/routes.js b/website/config/routes.js index df775a580f..2161bf210c 100644 --- a/website/config/routes.js +++ b/website/config/routes.js @@ -456,6 +456,8 @@ module.exports.routes = { }, 'GET /docs/contributing/orbit-development-and-release-strategy': '/docs/contributing/fleetd-development-and-release-strategy', 'GET /docs/contributing/run-locally-built-orbit': '/docs/contributing/run-locally-built-fleetd', + 'GET /deploy/deploy-fleet-on-hetzner-cloud': '/docs/deploy/deploy-on-hetzner-cloud', + 'GET /deploy': '/docs/deploy', 'GET /deploy/deploying-fleet-on-aws-with-terraform': '/docs/deploy/deploy-on-aws-with-terraform', 'GET /docs/deploy/server-installation': '/docs/deploy/introduction', 'GET /handbook/company/ceo': '/handbook/ceo', diff --git a/website/views/pages/articles/articles.ejs b/website/views/pages/articles/articles.ejs index 4b7be05544..5e860bec77 100644 --- a/website/views/pages/articles/articles.ejs +++ b/website/views/pages/articles/articles.ejs @@ -4,7 +4,6 @@
All
-
Deploy
Engineering
Security
Announcements