Skip to content

Commit 7254b72

Browse files
mjangmjang
committed
More
1 parent 433b6ae commit 7254b72

File tree

3 files changed

+10
-66
lines changed

3 files changed

+10
-66
lines changed

‎content/includes/nginx-one/how-to/add-instance.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
---
22
docs:
3+
<<<<<<< HEAD
34
files:
45
- content/nginx-one/connect-instances/add-instance.md
56
- content/nginx-one/getting-started.md
7+
=======
8+
>>>>>>> 4067237f (More)
69
---
710

811
You can add an instance to NGINX One Console in the following ways:

‎content/nginx-one/nginx-configs/add-instance.md

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,42 +16,24 @@ to set up a data plane key to connect your instances to NGINX One.
1616

1717
Before you add an instance to NGINX One Console, ensure:
1818

19-
- You have administrator access to NGINX One Console.
20-
- You have configured instances of NGINX that you want to manage through NGINX One Console.
21-
- You have or are ready to configure a data plane key.
22-
- You have or are ready to set up managed certificates.
19+
- You have [administrator access]({{< ref "/nginx-one/rbac/roles.md" >}}) to NGINX One Console.
20+
- You have [configured instances of NGINX]({{< ref "/nginx-one/getting-started.md#add-your-nginx-instances-to-nginx-one" >}}) that you want to manage through NGINX One Console.
21+
- You have or are ready to configure a [data plane key]({{< ref "/nginx-one/getting-started.md#generate-data-plane-key" >}}).
22+
- You have or are ready to set up [managed certificates]({{< ref "/nginx-one/certificates/manage-certificates.md" >}}).
2323

2424
{{< note >}}If this is the first time an instance is being added to a Config Sync Group, and you have not yet defined the configuration for that Config Sync Group, that instance provides the template for that group. For more information, see [Configuration management]({{< ref "nginx-one/config-sync-groups/manage-config-sync-groups#configuration-management" >}}).{{< /note >}}
2525

2626
## Add an instance
2727

28-
You can add an instance to NGINX One Console in the following ways:
29-
30-
- Directly, under **Instances**
31-
- Indirectly, by selecting a Config Sync Group, and selecting **Add Instance to Config Sync Group**
32-
33-
In either case, NGINX One Console gives you a choice for data plane keys:
34-
35-
- Create a new key
36-
- Use an existing key
37-
38-
NGINX One Console takes the option you use, and adds the data plane key to a command that you'd use to register your target instance. You should see the command in the **Add Instance** screen in the console.
39-
40-
Connect to the host where your NGINX instance is running. Run the provided command to [install NGINX Agent]({{< ref "/nginx-one/getting-started#install-nginx-agent" >}}) dependencies and packages on that host.
41-
42-
```bash
43-
curl https://agent.connect.nginx.com/nginx-agent/install | DATA_PLANE_KEY="<data_plane_key>" sh -s -- -y
44-
```
45-
46-
Once the process is complete, you can configure that instance in your NGINX One Console.
28+
{{< include "/nginx-one/how-to/add-instance.md" >}}
4729

4830
## Managed and Unmanaged Certificates
4931

5032
If you add an instance with SSL/TLS certificates, those certificates can match an existing managed SSL certificate/CA bundle.
5133

5234
### If the certificate is already managed
5335

54-
If you add an instance with a managed certificate, as described in [Add your NGINX instances to NGINX One], these certificates are added to your list of **Managed Certificates**.
36+
If you add an instance with a managed certificate, as described in [Add your NGINX instances to NGINX One]({{< ref "/nginx-one/getting-started.md#add-your-nginx-instances-to-nginx-one" >}}), these certificates are added to your list of **Managed Certificates**.
5537

5638
NGINX One Console can manage your instances along with those certificates.
5739

‎layouts/partials/list-main.html

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1 class="bd-title">
1919
</div>
2020
</div>
2121

22-
{{ if or (lt .WordCount 1) (eq $PageTitle "fF5 NGINX One Console") (eq $PageTitle "F5 NGINX App Protect DoS") (eq $PageTitle "F5 NGINX Plus") }}
22+
{{ if or (lt .WordCount 1) (eq $PageTitle "F5 NGINX One Console") (eq $PageTitle "F5 NGINX App Protect DoS") (eq $PageTitle "F5 NGINX Plus") }}
2323
<section>
2424
<div class="row">
2525
<div class="card-deck">
@@ -37,61 +37,20 @@ <h3 class="card-title" style="display: flex; align-items: center; gap: 5px;">
3737
{{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Get started")}}
3838
<p style="padding-bottom: 10px;">See benefits from the NGINX One Console </p>
3939
{{ end }}
40-
<<<<<<< HEAD
4140
{{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Draft new configurations")}}
4241
<p style="padding-bottom: 10px;">Work with Staged Configurations</p>
43-
=======
44-
{{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Set up new instances")}}
45-
<p style="padding-bottom: 10px;">Collaborate with Staged Configurations</p>
4642
{{ end }}
47-
<!-- {{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Secure your fleet")}}
48-
<p style="padding-bottom: 10px;">Configure alerts that match your security policies </p>
49-
<<<<<<< HEAD
50-
>>>>>>> 3dbfb304 (Sync with presentation)
51-
{{ end }}
52-
<<<<<<< HEAD
5343
<!-- {{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Secure your fleet")}}
5444
<p style="padding-bottom: 10px;">Configure alerts that match your security policies </p>
5545
{{ end }} -->
5646
{{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Manage your NGINX instances")}}
5747
<p style="padding-bottom: 10px;">Monitor and maintain your deployments </p>
58-
=======
59-
=======
60-
{{ end }} -->
61-
>>>>>>> 42d749df (Make more prod ready)
62-
{{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Watch your NGINX instances")}}
63-
<p style="padding-bottom: 10px;">Keep an inventory of your deployments </p>
64-
>>>>>>> 09d8a53f (More)
6548
{{ end }}
66-
<<<<<<< HEAD
6749
{{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Organize users with RBAC")}}
6850
<p style="padding-bottom: 10px;">Assign responsibilities with role-based access control </p>
69-
=======
70-
{{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Monitor your certificates")}}
71-
<<<<<<< HEAD
72-
<p style="padding-bottom: 10px;">Detect and resolve expired SSL certs in minutes </p>
73-
>>>>>>> 5e6d32b4 (new messages)
74-
=======
75-
<p style="padding-bottom: 10px;">Update your SSL certs before they expire </p>
76-
>>>>>>> 3dbfb304 (Sync with presentation)
7751
{{ end }}
78-
<<<<<<< HEAD
7952
{{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Automate with the NGINX One API")}}
8053
<p style="padding-bottom: 10px;">Manage your NGINX fleet over REST </p>
81-
=======
82-
{{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Organize your administrators with RBAC")}}
83-
<p style="padding-bottom: 10px;">Secure your systems with role-based access control </p>
84-
{{ end }}
85-
{{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Change multiple instances with one push")}}
86-
<p style="padding-bottom: 10px;">Simplify changes with Config Sync Groups </p>
87-
{{ end }}
88-
{{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "NGINX One API")}}
89-
<<<<<<< HEAD
90-
<p style="padding-bottom: 10px;">Automate NGINX fleet management </p>
91-
>>>>>>> 09d8a53f (More)
92-
=======
93-
<p style="padding-bottom: 10px;">Automate NGINX fleet management from the CLI </p>
94-
>>>>>>> 5e6d32b4 (new messages)
9554
{{ end }}
9655
{{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Glossary")}}
9756
<p style="padding-bottom: 10px;">Learn terms unique to NGINX One Console </p>

0 commit comments

Comments
 (0)