From 687bfaa1498556fd269dc6ce729746ad39528729 Mon Sep 17 00:00:00 2001
From: Marko Lisica <83164494+marko-lisica@users.noreply.github.com>
Date: Thu, 12 Dec 2024 13:25:39 +0100
Subject: [PATCH 1/7] Update fleet-server-configuration.md

---
 docs/Configuration/fleet-server-configuration.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/Configuration/fleet-server-configuration.md b/docs/Configuration/fleet-server-configuration.md
index 17f86de851f3..8af03c316f68 100644
--- a/docs/Configuration/fleet-server-configuration.md
+++ b/docs/Configuration/fleet-server-configuration.md
@@ -2091,6 +2091,18 @@ Minio users must set this to any nonempty value (eg. `minio`), as Minio does not
     software_intallers_region: us-east-1
   ```
 
+### s3_software_installers_cdn_url
+
+Content distribution network (CDN) URL. Leave blank if you don't use CDN distribution.
+
+- Default value:
+- Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CDN_URL`
+- Config file format:
+  ```yaml
+  s3:
+    software_intallers_cdn_url: https://jkl8dxv87sdh.cloudfront.net
+  ```
+
 ### s3_carves_bucket
 
 Name of the S3 bucket for file carves.

From 9bea6b013a3d10167c2ec233719fa7e70ab67116 Mon Sep 17 00:00:00 2001
From: Marko Lisica <83164494+marko-lisica@users.noreply.github.com>
Date: Thu, 12 Dec 2024 14:24:40 +0100
Subject: [PATCH 2/7] update

---
 .../fleet-server-configuration.md             | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/Configuration/fleet-server-configuration.md b/docs/Configuration/fleet-server-configuration.md
index 8af03c316f68..48fe1ac30141 100644
--- a/docs/Configuration/fleet-server-configuration.md
+++ b/docs/Configuration/fleet-server-configuration.md
@@ -2103,6 +2103,34 @@ Content distribution network (CDN) URL. Leave blank if you don't use CDN distrib
     software_intallers_cdn_url: https://jkl8dxv87sdh.cloudfront.net
   ```
 
+### s3_software_installers_cdn_url_sign_public_key_id
+
+Public key ID for URL signing. Leave blank if you don't use URL signing.
+
+- Default value:
+- Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CDN_URL_SIGN_PUBLIC_KEY_ID`
+- Config file format:
+  ```yaml
+  s3:
+    software_intallers_cdn_url_sign_public_key_id: 1babd7e98b03
+  ```
+
+### s3_software_installers_cdn_url_sign_private_key
+
+Private key for URL signing. Leave blank if you don't use URL signing.
+
+- Default value:
+- Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CDN_URL_SIGN_PRIVATE_KEY`
+- Config file format:
+  ```yaml
+  s3:
+    software_intallers_cdn_url_sign_private_key: |
+      ------BEGIN BEGIN RSA PRIVATE KEY-----
+      3126756bd0c54fbc90c9928ef59e7037af8983afd10048929ae5
+      7473e62c7aed...
+  ```
+
+
 ### s3_carves_bucket
 
 Name of the S3 bucket for file carves.

From 3a50dea7b2e428df4c4c4384be8a87f137ba4731 Mon Sep 17 00:00:00 2001
From: Marko Lisica <83164494+marko-lisica@users.noreply.github.com>
Date: Fri, 13 Dec 2024 18:44:10 +0100
Subject: [PATCH 3/7] Update fleet-server-configuration.md

---
 docs/Configuration/fleet-server-configuration.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/Configuration/fleet-server-configuration.md b/docs/Configuration/fleet-server-configuration.md
index 48fe1ac30141..6318799d759f 100644
--- a/docs/Configuration/fleet-server-configuration.md
+++ b/docs/Configuration/fleet-server-configuration.md
@@ -2103,9 +2103,9 @@ Content distribution network (CDN) URL. Leave blank if you don't use CDN distrib
     software_intallers_cdn_url: https://jkl8dxv87sdh.cloudfront.net
   ```
 
-### s3_software_installers_cdn_url_sign_public_key_id
+### s3_software_installers_cdn_url_signing_public_key_id
 
-Public key ID for URL signing. Leave blank if you don't use URL signing.
+Public key ID for URL signing. If `s3_software_installers_cdn_url` is set, this is required.
 
 - Default value:
 - Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CDN_URL_SIGN_PUBLIC_KEY_ID`
@@ -2115,9 +2115,9 @@ Public key ID for URL signing. Leave blank if you don't use URL signing.
     software_intallers_cdn_url_sign_public_key_id: 1babd7e98b03
   ```
 
-### s3_software_installers_cdn_url_sign_private_key
+### s3_software_installers_cdn_url_signing_private_key
 
-Private key for URL signing. Leave blank if you don't use URL signing.
+Private key for URL signing. If `s3_software_installers_cdn_url` is set, this is required.
 
 - Default value:
 - Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CDN_URL_SIGN_PRIVATE_KEY`

From 8e076b42ab37d7b127d097efd5091c5584af80ad Mon Sep 17 00:00:00 2001
From: Marko Lisica <83164494+marko-lisica@users.noreply.github.com>
Date: Mon, 16 Dec 2024 10:00:32 +0100
Subject: [PATCH 4/7] Update docs/Configuration/fleet-server-configuration.md

Co-authored-by: Rachael Shaw <r@rachael.wtf>
---
 docs/Configuration/fleet-server-configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Configuration/fleet-server-configuration.md b/docs/Configuration/fleet-server-configuration.md
index 6318799d759f..9e436373d1b4 100644
--- a/docs/Configuration/fleet-server-configuration.md
+++ b/docs/Configuration/fleet-server-configuration.md
@@ -2095,7 +2095,7 @@ Minio users must set this to any nonempty value (eg. `minio`), as Minio does not
 
 Content distribution network (CDN) URL. Leave blank if you don't use CDN distribution.
 
-- Default value:
+- Default value: none
 - Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CDN_URL`
 - Config file format:
   ```yaml

From ce19d3506f4eb14141f8876f7964b3df9ed32bed Mon Sep 17 00:00:00 2001
From: Marko Lisica <83164494+marko-lisica@users.noreply.github.com>
Date: Mon, 16 Dec 2024 10:00:38 +0100
Subject: [PATCH 5/7] Update docs/Configuration/fleet-server-configuration.md

Co-authored-by: Rachael Shaw <r@rachael.wtf>
---
 docs/Configuration/fleet-server-configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Configuration/fleet-server-configuration.md b/docs/Configuration/fleet-server-configuration.md
index 9e436373d1b4..ad5169005efb 100644
--- a/docs/Configuration/fleet-server-configuration.md
+++ b/docs/Configuration/fleet-server-configuration.md
@@ -2107,7 +2107,7 @@ Content distribution network (CDN) URL. Leave blank if you don't use CDN distrib
 
 Public key ID for URL signing. If `s3_software_installers_cdn_url` is set, this is required.
 
-- Default value:
+- Default value: none
 - Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CDN_URL_SIGN_PUBLIC_KEY_ID`
 - Config file format:
   ```yaml

From dbc0d473f788001a24fb5a4d5188c46186b56de6 Mon Sep 17 00:00:00 2001
From: Marko Lisica <83164494+marko-lisica@users.noreply.github.com>
Date: Mon, 16 Dec 2024 10:00:44 +0100
Subject: [PATCH 6/7] Update docs/Configuration/fleet-server-configuration.md

Co-authored-by: Rachael Shaw <r@rachael.wtf>
---
 docs/Configuration/fleet-server-configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Configuration/fleet-server-configuration.md b/docs/Configuration/fleet-server-configuration.md
index ad5169005efb..8aca598e3345 100644
--- a/docs/Configuration/fleet-server-configuration.md
+++ b/docs/Configuration/fleet-server-configuration.md
@@ -2119,7 +2119,7 @@ Public key ID for URL signing. If `s3_software_installers_cdn_url` is set, this
 
 Private key for URL signing. If `s3_software_installers_cdn_url` is set, this is required.
 
-- Default value:
+- Default value: none
 - Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CDN_URL_SIGN_PRIVATE_KEY`
 - Config file format:
   ```yaml

From b80c7f598541882d04c634eb7deed18a9a2f5383 Mon Sep 17 00:00:00 2001
From: Marko Lisica <83164494+marko-lisica@users.noreply.github.com>
Date: Mon, 16 Dec 2024 18:08:21 +0100
Subject: [PATCH 7/7] update

---
 .../fleet-server-configuration.md             | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/Configuration/fleet-server-configuration.md b/docs/Configuration/fleet-server-configuration.md
index 8aca598e3345..076c2f59e2b7 100644
--- a/docs/Configuration/fleet-server-configuration.md
+++ b/docs/Configuration/fleet-server-configuration.md
@@ -2091,40 +2091,40 @@ Minio users must set this to any nonempty value (eg. `minio`), as Minio does not
     software_intallers_region: us-east-1
   ```
 
-### s3_software_installers_cdn_url
+### s3_software_installers_cloudfront_url
 
-Content distribution network (CDN) URL. Leave blank if you don't use CDN distribution.
+CloudFront URL. Leave blank if you don't use CloudFront distribution.
 
 - Default value: none
-- Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CDN_URL`
+- Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CLOUDFRONT_URL`
 - Config file format:
   ```yaml
   s3:
-    software_intallers_cdn_url: https://jkl8dxv87sdh.cloudfront.net
+    software_intallers_cloudfront_url: https://jkl8dxv87sdh.cloudfront.net
   ```
 
-### s3_software_installers_cdn_url_signing_public_key_id
+### s3_software_installers_cloudfront_url_signing_public_key_id
 
-Public key ID for URL signing. If `s3_software_installers_cdn_url` is set, this is required.
+Public key ID for URL signing. If `s3_software_installers_cloudfront_url` is set, this is required.
 
 - Default value: none
-- Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CDN_URL_SIGN_PUBLIC_KEY_ID`
+- Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CLOUDFRONT_URL_SIGNING_PUBLIC_KEY_ID`
 - Config file format:
   ```yaml
   s3:
-    software_intallers_cdn_url_sign_public_key_id: 1babd7e98b03
+    software_intallers_cloudfront_url_signing_public_key_id: 1babd7e98b03
   ```
 
-### s3_software_installers_cdn_url_signing_private_key
+### s3_software_installers_cloudfront_url_signing_private_key
 
-Private key for URL signing. If `s3_software_installers_cdn_url` is set, this is required.
+Private key for URL signing. If `s3_software_installers_cloudfront_url` is set, this is required.
 
 - Default value: none
-- Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CDN_URL_SIGN_PRIVATE_KEY`
+- Environment variable: `FLEET_S3_SOFTWARE_INSTALLERS_CLOUDFRONT_URL_SIGNING_PRIVATE_KEY`
 - Config file format:
   ```yaml
   s3:
-    software_intallers_cdn_url_sign_private_key: |
+    software_intallers_cloudfront_url_signing_private_key: |
       ------BEGIN BEGIN RSA PRIVATE KEY-----
       3126756bd0c54fbc90c9928ef59e7037af8983afd10048929ae5
       7473e62c7aed...