Skip to content

Commit ab25551

Browse files
authored
Merge branch 'main' into feature-rbac-n1c
2 parents cf75f0d + 7263c52 commit ab25551

File tree

3 files changed

+36
-28
lines changed

3 files changed

+36
-28
lines changed

.github/workflows/linkchecker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
# Run LinkChecker
105105
- name: Run LinkChecker on ${{ matrix.doc_paths }}
106106
continue-on-error: ${{ env.isProduction != 'true' }}
107-
uses: nick-fields/retry@c97818ca39074beaea45180dba704f92496a0082 # v3.0.1
107+
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
108108
with:
109109
timeout_minutes: 10
110110
max_attempts: 3

layouts/redoc/single.html

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,32 @@
6060
}
6161
</style>
6262
<!--Use wide page layout for the API reference pages-->
63-
<div
64-
class="row flex-md-nowrap"
65-
style="
66-
position: relative;
67-
flex-wrap: nowrap;
68-
margin-right: 9px;
69-
max-width: calc(100% + 9px);
70-
"
71-
>
72-
<nav
73-
class="sidenav overflow-auto col-md-3 d-none d-md-block d-print-none sidebar-toggle-hidden-width"
74-
style="width: 25%; border-right: 1px solid #e6e6e6"
75-
;
63+
<section class="main-layout api">
64+
<div class="sidebar-layout" data-mf="true" style="display:none;">
65+
<nav id="sidebar-v2" class="sidebar">
66+
{{ partial "sidebar-v2.html" . }}
67+
</nav>
68+
</div>
69+
<div
70+
class="row flex-md-nowrap content-layout"
71+
style="
72+
position: relative;
73+
flex-wrap: nowrap;
74+
margin-right: 9px;
75+
max-width: calc(100% + 9px);
76+
"
7677
>
77-
{{ partial "sidebar.html" . }}
78-
</nav>
79-
<div class="nginx-docs-api-container">
80-
<div id="api-component">{{ .Content}}</div>
78+
<nav
79+
id="sidebar"
80+
class="sidenav overflow-auto col-md-3 d-none d-md-block d-print-none sidebar-toggle-hidden-width"
81+
style="width: 25%; border-right: 1px solid #e6e6e6"
82+
;
83+
>
84+
{{ partial "sidebar.html" . }}
85+
</nav>
86+
<div class="nginx-docs-api-container">
87+
<div id="api-component">{{ .Content}}</div>
88+
</div>
89+
</section>
8190
</div>
82-
</div>
8391
{{ end }}

static/nginx-one/api/one.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
{
4040
"name": "Certificates",
41-
"description": "The `Certificates` object in the NGINX One console represents an SSL certificate, covering both managed and unmanaged types. \nYou can view essential details like issuer, expiration status, and the instances or config sync groups where each certificate is deployed.\n",
41+
"description": "The `Certificates` object in NGINX One Console represents an SSL certificate, covering both managed and unmanaged types. \nYou can view essential details like issuer, expiration status, and the instances or config sync groups where each certificate is deployed.\n",
4242
"x-displayName": "Certificates"
4343
},
4444
{
@@ -48,7 +48,7 @@
4848
},
4949
{
5050
"name": "Events",
51-
"description": "Get a list of system events in the NGINX One console.\n",
51+
"description": "Get a list of system events in NGINX One Console.\n",
5252
"x-displayName": "Events"
5353
},
5454
{
@@ -616,7 +616,7 @@
616616
],
617617
"summary": "Delete an SSL certificate",
618618
"operationId": "deleteCertificate",
619-
"description": "Deletes a managed SSL certificate from the NGINX One console. This operation is disabled for unmanaged certificates, as they get cleaned up automatically when they are not used in any NGINX configuration.",
619+
"description": "Deletes a managed SSL certificate from NGINX One Console. This operation is disabled for unmanaged certificates, as they get cleaned up automatically when they are not used in any NGINX configuration.",
620620
"responses": {
621621
"204": {
622622
"description": "Successfully deleted the SSL certificate."
@@ -1127,7 +1127,7 @@
11271127
"Config Sync Groups"
11281128
],
11291129
"summary": "Delete an NGINX config sync group",
1130-
"description": "Delete a NGINX config sync group from the NGINX One console. You can delete a config sync group, only if it contains no NGINX instances.\n",
1130+
"description": "Delete a NGINX config sync group from NGINX One Console. You can delete a config sync group, only if it contains no NGINX instances.\n",
11311131
"operationId": "deleteConfigSyncGroup",
11321132
"responses": {
11331133
"204": {
@@ -1702,7 +1702,7 @@
17021702
"Config Sync Groups"
17031703
],
17041704
"summary": "Retrieves stored NGINX configurations for a NGINX config sync group",
1705-
"description": "Returns a list of all configurations for a NGINX config sync group. Only the last 5 are kept on the NGINX One Console for a NGINX config sync group.",
1705+
"description": "Returns a list of all configurations for a NGINX config sync group. Only the last 5 are kept on NGINX One Console for a NGINX config sync group.",
17061706
"operationId": "listConfigSyncGroupConfigurations",
17071707
"responses": {
17081708
"200": {
@@ -2811,7 +2811,7 @@
28112811
"Instances"
28122812
],
28132813
"summary": "Retrieves the stored NGINX configurations for an instance",
2814-
"description": "Returns a list of all configurations for a NGINX instance. Only the last 5 are kept on the NGINX One Console for a NGINX instance.",
2814+
"description": "Returns a list of all configurations for a NGINX instance. Only the last 5 are kept on NGINX One Console for a NGINX instance.",
28152815
"operationId": "listInstanceConfigurations",
28162816
"responses": {
28172817
"200": {
@@ -3731,7 +3731,7 @@
37313731
"properties": {
37323732
"total": {
37333733
"type": "integer",
3734-
"description": "The absolute total number of the resource in the NGINX One Console.\n"
3734+
"description": "The absolute total number of the resource in NGINX One Console.\n"
37353735
},
37363736
"count": {
37373737
"type": "integer",
@@ -4078,7 +4078,7 @@
40784078
},
40794079
"CertificateType": {
40804080
"type": "string",
4081-
"description": "Certificate type:\n * `ca_bundle` - This certificate object is a CA bundle.\n * `cert_key` - This certificate object is consisted of public certificates and key.\n * `unmanaged` - This certificate is not managed by NGINX One console and its type is unmanaged.\n",
4081+
"description": "Certificate type:\n * `ca_bundle` - This certificate object is a CA bundle.\n * `cert_key` - This certificate object is consisted of public certificates and key.\n * `unmanaged` - This certificate is not managed by NGINX One Console and its type is unmanaged.\n",
40824082
"enum": [
40834083
"ca_bundle",
40844084
"cert_key",
@@ -5535,7 +5535,7 @@
55355535
},
55365536
"NginxConfigPayloads": {
55375537
"type": "array",
5538-
"description": "An array of payloads that track the file paths of each SSL certificates and key, indicating where to deploy\nthem onto the data plane instance.\n* If the `type` is `managed_certificate` or `managed_key`, you need to specify an `object_id`.\n * The `object_id` must represent a managed certificate object, or a `400 Bad Request` is returned. \n * The `contents` field is optional and is ignored if included.\n* The NGINX One Console manages deployed file paths only for managed certificates and keys. If you don't want \nthem to be managed by NGINX One Console, `inline_content` and `inline_secret` can be used for certificates or \nkeys, respectively. When you retrieve certificate deployment details, only the file paths of managed \ncertificates and keys will be shown.\n* If you use `inline_content` and `inline_secret` in your NGINX configuration, the NGINX One Console \nwill detect them. When they are used as SSL directives of the NGINX configuration \nfor certificates and keys, the certificates will be listed as `unmanaged_certificate` in the certificate \ndeployment details.\n",
5538+
"description": "An array of payloads that track the file paths of each SSL certificates and key, indicating where to deploy\nthem onto the data plane instance.\n* If the `type` is `managed_certificate` or `managed_key`, you need to specify an `object_id`.\n * The `object_id` must represent a managed certificate object, or a `400 Bad Request` is returned. \n * The `contents` field is optional and is ignored if included.\n* NGINX One Console manages deployed file paths only for managed certificates and keys. If you don't want \nthem to be managed by NGINX One Console, `inline_content` and `inline_secret` can be used for certificates or \nkeys, respectively. When you retrieve certificate deployment details, only the file paths of managed \ncertificates and keys will be shown.\n* If you use `inline_content` and `inline_secret` in your NGINX configuration, NGINX One Console \nwill detect them. When they are used as SSL directives of the NGINX configuration \nfor certificates and keys, the certificates will be listed as `unmanaged_certificate` in the certificate \ndeployment details.\n",
55395539
"items": {
55405540
"$ref": "#/components/schemas/NginxConfigPayload"
55415541
},

0 commit comments

Comments
 (0)