Skip to content

Commit 900cc63

Browse files
authored
Merge branch 'nginx:main' into Mv1205
2 parents 3d197e4 + 5c9425e commit 900cc63

File tree

16 files changed

+491
-32
lines changed

16 files changed

+491
-32
lines changed
Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
---
22
docs:
3+
file:
4+
- content/solutions/about-subscription-licenses.md
5+
- content/nap-waf/v5/admin-guide/install.md
36
---
47

58
1. Copy the license file to `/etc/nginx/license.jwt` on Linux or `/usr/local/etc/nginx/license.jwt` on FreeBSD for each NGINX Plus instance.
9+
2. Reload NGINX:
610

7-
1. **SELinux**: If you're running a Linux distribution with SELinux enabled, set the file security context type with the following command:
8-
9-
```bash
10-
chcon -t httpd_config_t /etc/nginx/license.jwt
11+
```shell
12+
systemctl reload nginx
1113
```
14+
15+
**If SELinux is enabled**:
16+
17+
Set the correct file context so NGINX can read the license:
18+
19+
```shell
20+
chcon -t httpd_config_t /etc/nginx/license.jwt
21+
```

content/includes/licensing-and-reporting/configure-nginx-plus-report-to-nim.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ docs:
1717
3. Reload NGINX:
1818
1919
``` bash
20-
nginx -s reload
20+
systemctl reload nginx
2121
```

content/nginx-one/changelog.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@ h2 {
3030

3131
Stay up-to-date with what's new and improved in the F5 NGINX One Console.
3232

33+
## Apr 30, 2025
34+
35+
### Manage RBAC access with namespaces
36+
37+
We have added support for namespaces in N1C. You can now:
38+
39+
- Manage resources in isolation in different namespaces.
40+
- Configure granular user permission controls base on namespace.
41+
3342
## April 3, 2025
3443

3544
### Create Custom Roles with more precise permissions

content/nginx-one/how-to/config-sync-groups/manage-config-sync-groups.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,12 @@ Now that you created a Config Sync Group, you can add instances to that group. A
100100

101101
Any instance that joins the group afterwards inherits that configuration.
102102

103+
{{< note >}} If you see the following [Config Sync Group Status](#config-sync-group-status) message: **Out of Sync**:
104+
105+
- Review the instance details in NGINX One Console to identify any publication problems.
106+
- After you change the configuration of the Config Sync Group, [Publish it](#publish-the-config-sync-group-configuration].
107+
In that case, review and resolve discrepancies between the Instance and the rest of the Config Sync Group. {{< /note >}}
108+
103109
### Add an existing instance to a Config Sync Group {#add-an-existing-instance-to-a-config-sync-group}
104110

105111
You can add existing NGINX instances that are already registered with NGINX One to a Config Sync Group.

content/nginx/admin-guide/basic-functionality/managing-configuration-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ stream {
9191

9292
In general, a _child_ context – a context contained within another context (its _parent_) – inherits the settings of directives included at the parent level. Some directives can appear in multiple contexts, in which case you can override the setting inherited from the parent by including the directive in the child context. For an example, see the [proxy_set_header](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_set_header) directive.
9393

94-
## Reloading Configuration
94+
## Reload Configuration File
9595

9696
For changes to the configuration file to take effect, it must be reloaded. You can either restart the `nginx` process or send the `reload` signal to upgrade the configuration without interrupting the processing of current requests. For details, see [Control NGINX Processes at Runtime]({{< ref "/nginx/admin-guide/basic-functionality/runtime-control.md" >}}).
9797

content/nginx/admin-guide/installing-nginx/installing-nginx-plus-amazon-web-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The AMIs contain the following components:
1616
- Latest version of [NGINX Plus](https://www.f5.com/products/nginx/nginx-plus), optimized for use on Amazon EC2
1717
- Pre-packaged software for building highly available (HA) NGINX Plus configurations
1818

19-
## Installing the F5 NGINX Plus AMI
19+
## Install the F5 NGINX Plus AMI
2020

2121
To quickly set up an NGINX Plus environment on AWS:
2222

content/nginx/admin-guide/installing-nginx/installing-nginx-plus-google-cloud-platform.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ type:
1212
[NGINX Plus](https://www.f5.com/products/nginx/nginx-plus), the high‑performance application delivery platform, load balancer, and web server, is available on the Google Cloud Platform as a virtual machine (VM) image. The VM image contains the latest version of NGINX Plus, optimized for use with the Google Cloud Platform Compute Engine.
1313

1414

15-
## Installing the NGINX Plus VM
15+
## Install the NGINX Plus VM
1616

1717
To quickly set up an NGINX Plus environment on the Google Cloud Platform, perform the following steps.
1818

@@ -52,7 +52,7 @@ If you encounter any problems with NGINX Plus configuration, documentation is a
5252
Customers who purchase an NGINX Plus VM image on the Google Cloud Platform are eligible for the Google Cloud Platform VM support provided by the NGINX, Inc. engineering team. To activate support, submit the [Google Cloud Platform Support Activation](https://www.nginx.com/gcp-support-activation/) form.
5353

5454

55-
### Accessing the Open Source Licenses for NGINX Plus
55+
### Access the Open Source Licenses for NGINX Plus
5656

5757
NGINX Plus includes open source software written by NGINX, Inc. and other contributors. The text of the open source licenses is provided in Appendix B of the _NGINX Plus Reference Guide_. To access the guide included with the NGINX Plus VM instance, run this command:
5858

content/nginx/admin-guide/installing-nginx/installing-nginx-plus-microsoft-azure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type:
1313

1414
The VM image contains the latest version of NGINX Plus, optimized for use with Azure.
1515

16-
## Installing the NGINX Plus VM
16+
## Install the NGINX Plus VM
1717

1818
To quickly set up an NGINX Plus environment on Microsoft Azure:
1919

content/nginx/admin-guide/mail-proxy/mail-proxy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description: Simplify your email service and improve its performance with NGINX or
33
F5 NGINX Plus as a proxy for the IMAP, POP3, and SMTP protocols
44
docs: DOCS-423
5-
title: Configuring NGINX as a Mail Proxy Server
5+
title: Configure NGINX as a Mail Proxy Server
66
toc: true
77
weight: 100
88
type:

content/nginx/admin-guide/monitoring/logging.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,33 @@ type:
99
- how-to
1010
---
1111

12-
This article describes how to configure logging of errors and processed requests in NGINX Open Source and NGINX Plus.
12+
This article describes how to log errors and requests in NGINX Open Source and NGINX Plus.
1313

1414
<span id="error_log"></span>
15-
## Setting Up the Error Log
15+
## Set Up the Error Log
16+
17+
NGINX writes an error log that records encountered issues of different severity levels. The [error_log](https://nginx.org/en/docs/ngx_core_module.html#error_log) directive sets up the log location and severity level. The log location can be a particular file, `stderr`, or `syslog`. By default, the error log is located at **logs/error.log**, but the absolute path depends on the operating system and installation. The error severity level follows the `syslog` classification system. The log includes messages from all severity levels above the specified level.
1618

17-
NGINX writes information about encountered issues of different severity levels to the error log. The [error_log](https://nginx.org/en/docs/ngx_core_module.html#error_log) directive sets up logging to a particular file, `stderr`, or `syslog` and specifies the minimal severity level of messages to log. By default, the error log is located at **logs/error.log** (the absolute path depends on the operating system and installation), and messages from all severity levels above the one specified are logged.
1819

1920
The configuration below changes the minimal severity level of error messages to log from `error` to `warn`:
2021

2122
```nginx
2223
error_log logs/error.log warn;
2324
```
2425

25-
In this case, messages of `warn`, `error` `crit`, `alert`, and `emerg` levels are logged.
26+
In this case, messages above the `warn` level are logged. That includes `warn`, `error` `crit`, `alert`, and `emerg` levels.
2627

27-
The default setting of the error log works globally. To override it, place the [error_log](https://nginx.org/en/docs/ngx_core_module.html#error_log) directive in the `main` (top-level) configuration context. Settings in the `main` context are always inherited by other configuration levels (`http`, `server`, `location`). The `error_log` directive can be also specified at the [http](https://nginx.org/en/docs/http/ngx_http_core_module.html#http), [stream](https://nginx.org/en/docs/stream/ngx_stream_core_module.html#stream), `server` and [location](https://nginx.org/en/docs/http/ngx_http_core_module.html#location) levels and overrides the setting inherited from the higher levels. In case of an error, the message is written to only one error log, the one closest to the level where the error has occurred. However, if several `error_log` directives are specified on the same level, the message are written to all specified logs.
28+
The default setting of the error log works globally. To override it, place the [error_log](https://nginx.org/en/docs/ngx_core_module.html#error_log) directive in the `main` (top-level) configuration context. Settings in the `main` context are always inherited by other configuration levels (`http`, `server`, `location`). The `error_log` directive can be also specified at the [http](https://nginx.org/en/docs/http/ngx_http_core_module.html#http), [stream](https://nginx.org/en/docs/stream/ngx_stream_core_module.html#stream), `server` and [location](https://nginx.org/en/docs/http/ngx_http_core_module.html#location) levels. Settings at lower levels override the settings inherited from the higher levels. Each error message is written only once to the error log closest to the level where the error has occurred. However, if several `error_log` directives are specified on the same level, the message is written to all specified logs.
2829

2930
> **Note:** The ability to specify multiple `error_log` directives on the same configuration level was added in NGINX Open Source version [1.5.2](https://nginx.org/en/CHANGES).
3031
3132

3233
<span id="access_log"></span>
33-
## Setting Up the Access Log
34+
## Set Up the Access Log
3435

35-
NGINX writes information about client requests in the access log right after the request is processed. By default, the access log is located at **logs/access.log**, and the information is written to the log in the predefined **combined** format. To override the default setting, use the [log_format](https://nginx.org/en/docs/http/ngx_http_log_module.html#log_format) directive to change the format of logged messages, as well as the [access_log](https://nginx.org/en/docs/http/ngx_http_log_module.html#access_log) directive to specify the location of the log and its format. The log format is defined using variables.
36+
NGINX records client requests in the access log right after the request is processed. The [access_log](https://nginx.org/en/docs/http/ngx_http_log_module.html#access_log) directive specifies the location of the log and its format. By default, the access log is located at **logs/access.log**. The format of logged messages is the predefined **combined** format. To change the format of logged messages, use the [log_format](https://nginx.org/en/docs/http/ngx_http_log_module.html#log_format) directive. The log format is defined using variables.
3637

37-
The following examples define the log format that extends the predefined **combined** format with the value indicating the ratio of gzip compression of the response. The format is then applied to a virtual server that enables compression.
38+
The following example extends the predefined **combined** format by specifying the `gzip ratio` keyword. This enables gzip compression of the response in a virtual server.
3839

3940
```nginx
4041
http {
@@ -50,7 +51,7 @@ http {
5051
}
5152
```
5253

53-
Another example of the log format enables tracking different time values between NGINX and an upstream server that may help to diagnose a problem if your website experience slowdowns. You can use the following variables to log the indicated time values:
54+
Another example of the log format enables tracking different time values between NGINX and an upstream server. This may help with diagnosing a slowdown of your website. You can use the following variables to log the indicated time values:
5455

5556
- [`$upstream_connect_time`](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#var_upstream_connect_time) – The time spent on establishing a connection with an upstream server
5657
- [`$upstream_header_time`](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#var_upstream_header_time) – The time between establishing a connection and receiving the first byte of the response header from the upstream server
@@ -80,11 +81,10 @@ When reading the resulting time values, keep the following in mind:
8081
- When a request is unable to reach an upstream server or a full header cannot be received, the variable contains `0` (zero)
8182
- In case of internal error while connecting to an upstream or when a reply is taken from the cache, the variable contains `-` (hyphen)
8283

83-
Logging can be optimized by enabling the buffer for log messages and the cache of descriptors of frequently used log files whose names contain variables. To enable buffering use the `buffer` parameter of the [access_log](https://nginx.org/en/docs/http/ngx_http_log_module.html#access_log) directive to specify the size of the buffer. The buffered messages are then written to the log file when the next log message does not fit into the buffer as well as in some other [cases](https://nginx.org/en/docs/http/ngx_http_log_module.html#access_log).
84-
84+
The log can be optimized by enabling the `buffer` and the `cache`. With the [buffer](https://nginx.org/en/docs/http/ngx_http_log_module.html#access_log) parameter enabled, messages will be stored in the buffer first. When the buffer is full (or in some other [cases](https://nginx.org/en/docs/http/ngx_http_log_module.html#access_log)), the messages will be written to the log.
8585
To enable caching of log file descriptors, use the [open_log_file_cache](https://nginx.org/en/docs/http/ngx_http_log_module.html#open_log_file_cache) directive.
8686

87-
Similar to the `error_log` directive, the [access_log](https://nginx.org/en/docs/http/ngx_http_log_module.html#access_log) directive defined on a particular configuration level overrides the settings from the previous levels. When processing of a request is completed, the message is written to the log that is configured on the current level, or inherited from the previous levels. If one level defines multiple access logs, the message is written to all of them.
87+
Similar to the `error_log` directive, the [access_log](https://nginx.org/en/docs/http/ngx_http_log_module.html#access_log) directive defined on a particular configuration level overrides the settings from the previous levels. When processing of a request is completed, the message is written to the log that is configured on the current level, or inherited from the previous levels. If one level has multiple access log definitions, the message is written to all of them.
8888

8989

9090
<span id="conditional"></span>

0 commit comments

Comments
 (0)