From d1d05a27ec17696613b4c72fa5fd05109f43c38a Mon Sep 17 00:00:00 2001 From: Mike Jang <3287976+mjang@users.noreply.github.com> Date: Wed, 16 Apr 2025 11:17:57 -0700 Subject: [PATCH 1/5] Point to Out of Sync --- .../how-to/config-sync-groups/manage-config-sync-groups.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md b/content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md index 11d717b75..9a4be5bf9 100644 --- a/content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md +++ b/content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md @@ -100,6 +100,9 @@ Now that you created a Config Sync Group, you can add instances to that group. A Any instance that joins the group afterwards inherits that configuration. +If there are conflicts between an Instance and the Config Sync Group, you'll see the following [Config Sync Group Status](#config-sync-group-status): "Out of Sync". +In that case, review and resolve discrepencies between the Instance and the rest of the Config Sync Group. + ### Add an existing instance to a Config Sync Group {#add-an-existing-instance-to-a-config-sync-group} You can add existing NGINX instances that are already registered with NGINX One to a Config Sync Group. From 7e9bed0890f5b4587b79f13272dab24b9d0aeda2 Mon Sep 17 00:00:00 2001 From: Mike Jang <3287976+mjang@users.noreply.github.com> Date: Wed, 16 Apr 2025 11:37:04 -0700 Subject: [PATCH 2/5] Highilght note --- content/includes/nginx-agent/connect-to-n1-console.md | 5 +++++ .../includes/nginx-agent/install-from-nginx-plus-repo.md | 5 +++++ content/includes/nginx-agent/install-from-noss-repo.md | 5 +++++ content/includes/nginx-agent/install-from-script.md | 5 +++++ content/includes/nginx-agent/migrate-v2-to-v3.md | 5 +++++ content/includes/nginx-agent/tech-specs.md | 5 +++++ content/includes/nginx-agent/uninstall.md | 5 +++++ .../how-to/config-sync-groups/manage-config-sync-groups.md | 4 ++-- content/nginx-one/nginx-agent/_index.md | 6 ++++++ 9 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 content/includes/nginx-agent/connect-to-n1-console.md create mode 100644 content/includes/nginx-agent/install-from-nginx-plus-repo.md create mode 100644 content/includes/nginx-agent/install-from-noss-repo.md create mode 100644 content/includes/nginx-agent/install-from-script.md create mode 100644 content/includes/nginx-agent/migrate-v2-to-v3.md create mode 100644 content/includes/nginx-agent/tech-specs.md create mode 100644 content/includes/nginx-agent/uninstall.md create mode 100644 content/nginx-one/nginx-agent/_index.md diff --git a/content/includes/nginx-agent/connect-to-n1-console.md b/content/includes/nginx-agent/connect-to-n1-console.md new file mode 100644 index 000000000..4ec7b7fea --- /dev/null +++ b/content/includes/nginx-agent/connect-to-n1-console.md @@ -0,0 +1,5 @@ +--- +docs: DOCS-000 +files: + - content/nginx-one/ +--- diff --git a/content/includes/nginx-agent/install-from-nginx-plus-repo.md b/content/includes/nginx-agent/install-from-nginx-plus-repo.md new file mode 100644 index 000000000..4ec7b7fea --- /dev/null +++ b/content/includes/nginx-agent/install-from-nginx-plus-repo.md @@ -0,0 +1,5 @@ +--- +docs: DOCS-000 +files: + - content/nginx-one/ +--- diff --git a/content/includes/nginx-agent/install-from-noss-repo.md b/content/includes/nginx-agent/install-from-noss-repo.md new file mode 100644 index 000000000..4ec7b7fea --- /dev/null +++ b/content/includes/nginx-agent/install-from-noss-repo.md @@ -0,0 +1,5 @@ +--- +docs: DOCS-000 +files: + - content/nginx-one/ +--- diff --git a/content/includes/nginx-agent/install-from-script.md b/content/includes/nginx-agent/install-from-script.md new file mode 100644 index 000000000..4ec7b7fea --- /dev/null +++ b/content/includes/nginx-agent/install-from-script.md @@ -0,0 +1,5 @@ +--- +docs: DOCS-000 +files: + - content/nginx-one/ +--- diff --git a/content/includes/nginx-agent/migrate-v2-to-v3.md b/content/includes/nginx-agent/migrate-v2-to-v3.md new file mode 100644 index 000000000..4ec7b7fea --- /dev/null +++ b/content/includes/nginx-agent/migrate-v2-to-v3.md @@ -0,0 +1,5 @@ +--- +docs: DOCS-000 +files: + - content/nginx-one/ +--- diff --git a/content/includes/nginx-agent/tech-specs.md b/content/includes/nginx-agent/tech-specs.md new file mode 100644 index 000000000..4ec7b7fea --- /dev/null +++ b/content/includes/nginx-agent/tech-specs.md @@ -0,0 +1,5 @@ +--- +docs: DOCS-000 +files: + - content/nginx-one/ +--- diff --git a/content/includes/nginx-agent/uninstall.md b/content/includes/nginx-agent/uninstall.md new file mode 100644 index 000000000..4ec7b7fea --- /dev/null +++ b/content/includes/nginx-agent/uninstall.md @@ -0,0 +1,5 @@ +--- +docs: DOCS-000 +files: + - content/nginx-one/ +--- diff --git a/content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md b/content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md index 9a4be5bf9..6d1aef328 100644 --- a/content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md +++ b/content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md @@ -100,8 +100,8 @@ Now that you created a Config Sync Group, you can add instances to that group. A Any instance that joins the group afterwards inherits that configuration. -If there are conflicts between an Instance and the Config Sync Group, you'll see the following [Config Sync Group Status](#config-sync-group-status): "Out of Sync". -In that case, review and resolve discrepencies between the Instance and the rest of the Config Sync Group. +{{< note >}} If there are conflicts between an Instance and the Config Sync Group, you'll see the following [Config Sync Group Status](#config-sync-group-status) message: **Out of Sync**. +In that case, review and resolve discrepencies between the Instance and the rest of the Config Sync Group. {{< /note >}} ### Add an existing instance to a Config Sync Group {#add-an-existing-instance-to-a-config-sync-group} diff --git a/content/nginx-one/nginx-agent/_index.md b/content/nginx-one/nginx-agent/_index.md new file mode 100644 index 000000000..b9f3a1e38 --- /dev/null +++ b/content/nginx-one/nginx-agent/_index.md @@ -0,0 +1,6 @@ +--- +title: NGINX Agent +description: +weight: 400 +url: /nginx-one/nginx-agent +--- From b4c6d67867d49c3f5c2cdda5ce35da1ef82e2ada Mon Sep 17 00:00:00 2001 From: Mike Jang <3287976+mjang@users.noreply.github.com> Date: Wed, 16 Apr 2025 11:37:43 -0700 Subject: [PATCH 3/5] Don't overcommit --- content/includes/nginx-agent/connect-to-n1-console.md | 5 ----- content/includes/nginx-agent/install-from-nginx-plus-repo.md | 5 ----- content/includes/nginx-agent/install-from-noss-repo.md | 5 ----- content/includes/nginx-agent/install-from-script.md | 5 ----- content/includes/nginx-agent/migrate-v2-to-v3.md | 5 ----- content/includes/nginx-agent/tech-specs.md | 5 ----- content/includes/nginx-agent/uninstall.md | 5 ----- 7 files changed, 35 deletions(-) delete mode 100644 content/includes/nginx-agent/connect-to-n1-console.md delete mode 100644 content/includes/nginx-agent/install-from-nginx-plus-repo.md delete mode 100644 content/includes/nginx-agent/install-from-noss-repo.md delete mode 100644 content/includes/nginx-agent/install-from-script.md delete mode 100644 content/includes/nginx-agent/migrate-v2-to-v3.md delete mode 100644 content/includes/nginx-agent/tech-specs.md delete mode 100644 content/includes/nginx-agent/uninstall.md diff --git a/content/includes/nginx-agent/connect-to-n1-console.md b/content/includes/nginx-agent/connect-to-n1-console.md deleted file mode 100644 index 4ec7b7fea..000000000 --- a/content/includes/nginx-agent/connect-to-n1-console.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -docs: DOCS-000 -files: - - content/nginx-one/ ---- diff --git a/content/includes/nginx-agent/install-from-nginx-plus-repo.md b/content/includes/nginx-agent/install-from-nginx-plus-repo.md deleted file mode 100644 index 4ec7b7fea..000000000 --- a/content/includes/nginx-agent/install-from-nginx-plus-repo.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -docs: DOCS-000 -files: - - content/nginx-one/ ---- diff --git a/content/includes/nginx-agent/install-from-noss-repo.md b/content/includes/nginx-agent/install-from-noss-repo.md deleted file mode 100644 index 4ec7b7fea..000000000 --- a/content/includes/nginx-agent/install-from-noss-repo.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -docs: DOCS-000 -files: - - content/nginx-one/ ---- diff --git a/content/includes/nginx-agent/install-from-script.md b/content/includes/nginx-agent/install-from-script.md deleted file mode 100644 index 4ec7b7fea..000000000 --- a/content/includes/nginx-agent/install-from-script.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -docs: DOCS-000 -files: - - content/nginx-one/ ---- diff --git a/content/includes/nginx-agent/migrate-v2-to-v3.md b/content/includes/nginx-agent/migrate-v2-to-v3.md deleted file mode 100644 index 4ec7b7fea..000000000 --- a/content/includes/nginx-agent/migrate-v2-to-v3.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -docs: DOCS-000 -files: - - content/nginx-one/ ---- diff --git a/content/includes/nginx-agent/tech-specs.md b/content/includes/nginx-agent/tech-specs.md deleted file mode 100644 index 4ec7b7fea..000000000 --- a/content/includes/nginx-agent/tech-specs.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -docs: DOCS-000 -files: - - content/nginx-one/ ---- diff --git a/content/includes/nginx-agent/uninstall.md b/content/includes/nginx-agent/uninstall.md deleted file mode 100644 index 4ec7b7fea..000000000 --- a/content/includes/nginx-agent/uninstall.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -docs: DOCS-000 -files: - - content/nginx-one/ ---- From fcb88a72fd110719d99920dbdc51defa19622baf Mon Sep 17 00:00:00 2001 From: Mike Jang <3287976+mjang@users.noreply.github.com> Date: Wed, 16 Apr 2025 11:38:55 -0700 Subject: [PATCH 4/5] remove overcommit --- content/nginx-one/nginx-agent/_index.md | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 content/nginx-one/nginx-agent/_index.md diff --git a/content/nginx-one/nginx-agent/_index.md b/content/nginx-one/nginx-agent/_index.md deleted file mode 100644 index b9f3a1e38..000000000 --- a/content/nginx-one/nginx-agent/_index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: NGINX Agent -description: -weight: 400 -url: /nginx-one/nginx-agent ---- From 14c15b9c0d9ba2687c39208d2edac4448c59d95c Mon Sep 17 00:00:00 2001 From: Mike Jang <3287976+mjang@users.noreply.github.com> Date: Wed, 16 Apr 2025 11:46:22 -0700 Subject: [PATCH 5/5] typo --- .../how-to/config-sync-groups/manage-config-sync-groups.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md b/content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md index 6d1aef328..e79a2adc9 100644 --- a/content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md +++ b/content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md @@ -100,7 +100,7 @@ Now that you created a Config Sync Group, you can add instances to that group. A Any instance that joins the group afterwards inherits that configuration. -{{< note >}} If there are conflicts between an Instance and the Config Sync Group, you'll see the following [Config Sync Group Status](#config-sync-group-status) message: **Out of Sync**. +{{< note >}} If there are conflicts between an instance and the Config Sync Group, you'll see the following [Config Sync Group Status](#config-sync-group-status) message: **Out of Sync**. In that case, review and resolve discrepencies between the Instance and the rest of the Config Sync Group. {{< /note >}} ### Add an existing instance to a Config Sync Group {#add-an-existing-instance-to-a-config-sync-group}