Skip to content

Commit dfc25ee

Browse files
authored
Merge branch 'main' into nap-release-5.7
2 parents c898f90 + f81bf64 commit dfc25ee

File tree

197 files changed

+26319
-2702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+26319
-2702
lines changed

.github/workflows/build-push.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ on:
3333
type: string
3434
pull_request:
3535
branches:
36-
- "*"
36+
- "**"
3737
push:
3838
branches:
3939
- "main"
4040

4141
env:
4242
FRONT_DOOR_USERNAME: ${{ secrets.FRONT_DOOR_USERNAME }}
4343
FRONT_DOOR_PASSWORD: ${{ secrets.FRONT_DOOR_PASSWORD }}
44-
GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
44+
GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
4545
jobs:
4646
prod-check-branch:
4747
runs-on: ubuntu-24.04
4848
steps:
4949
- name: Output variables
5050
run: |
51-
echo "Environment: ${{ inputs.environment }}"
51+
echo "Environment: ${{ inputs.environment || github.event.client_payload.environment }}"
5252
echo "Branch: ${{ github.ref }}"
5353
- name: Checks to see that main branch is selected if deploying to prod
5454
if: ${{ inputs.environment == 'prod' && github.ref != 'refs/heads/main' }}
@@ -65,14 +65,33 @@ jobs:
6565
docs_source_path: "public"
6666
docs_build_path: "./"
6767
doc_type: "hugo"
68-
environment: ${{inputs.environment}}
68+
environment: ${{ inputs.environment || github.event.client_payload.environment }}
6969
force_hugo_theme_version: ${{inputs.hugo_theme_override}}
7070
auto_deploy_branch: "main"
7171
auto_deploy_env: "prod"
7272
secrets:
7373
AZURE_CREDENTIALS: ${{secrets.AZURE_CREDENTIALS_DOCS}}
7474
AZURE_KEY_VAULT: ${{secrets.AZURE_KEY_VAULT_DOCS}}
7575

76+
trigger-theme-slack-notification:
77+
if: github.event_name == 'repository_dispatch'
78+
needs: call-docs-build-push
79+
runs-on: ubuntu-latest
80+
permissions: read-all
81+
steps:
82+
- name: Trigger 'Slack notification for new theme release' workflow in 'nginx-hugo-theme' repo.
83+
run: |
84+
curl -L \
85+
-X POST \
86+
-H "Accept: application/vnd.github+json" \
87+
-H "Authorization: Bearer ${{ secrets.THEME_SLACK_FLOW_PAT }}" \
88+
-H "X-GitHub-Api-Version: 2022-11-28" \
89+
"https://api.github.com/repos/${{ secrets.OWNER }}/${{ secrets.REPO }}/dispatches" \
90+
-d "{\"event_type\": \"trigger-slack-notification\", \"client_payload\": {\"previewURL\": \"${{ env.PREVIEW_URL }}\", \"author\": \"${{ github.event.client_payload.author}}\", \"tag_name\": \"${{ github.event.client_payload.tag_name }}\", \"release_name\": \"${{ github.event.client_payload.release_name }}\"}}"
91+
env:
92+
PREVIEW_URL: ${{ needs.call-docs-build-push.outputs.PREVIEW_URL }}
93+
94+
7695
lighthouseci:
7796
if: github.event.pull_request
7897
needs: call-docs-build-push

CLOSED_CONTRIBUTIONS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To create closed content, add the closed repository as a remote to the main repo
3333
```shell
3434
cd documentation
3535
git remote add internal [email protected]:<closed-url>.git
36-
git fetch
36+
git fetch --all
3737
```
3838

3939
Check out the remote `main` branch, and use it to create a feature branch. **Ensure that you prefix all branch names with `internal/`**
@@ -64,4 +64,4 @@ git merge internal/internal/feature
6464
git push origin
6565
```
6666

67-
Once the content changes have been merged in the open repository, they will synchronize back to the closed repository.
67+
Once the content changes have been merged in the open repository, they will synchronize back to the closed repository.

config/_default/config.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ enableGitInfo = true
4747
"taxonomyTerm"
4848
]
4949
taxonomiesExcludedFromSitemap = ["tags", "categories", "doctypes"]
50-
50+
unitversion= "1.34.1"
51+
unitversionv= "v1.34.1"
5152
#logo = ""
5253

5354
# Version lists; used by the versions shortcode

content/includes/nginx-one/staged-config-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ With Staged Configurations, you can use these features of NGINX One Console:
1313
- Automatic syntax checking
1414
- Contextual documentation
1515
- Dynamic analysis of your work in progress
16-
- Suggestions from our AI assistant
16+
- Suggestions from our F5 AI assistant
1717

1818
Once you've finished your work and have pushed the changes to an Instance or a Config Sync Group, you can next delete that Staged Configuration.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Run the following command (as root) so Unit can access the application
2+
directory (If the application uses several directories, run the command for
3+
each one):
4+
5+
```console
6+
# chown -R unit:unit /path/to/app/ # User and group that Unit's router runs as by default
7+
```
8+
9+
10+
{{< note >}}
11+
The **unit:unit** user-group pair is available only with
12+
[official packages]({{< relref "/unit/installation.md#installation-precomp-pkgs" >}})
13+
, Docker [images]({{< relref "/unit/installation.md#installation-docker" >}}),
14+
and some [third-party repos]({{< relref "/unit/installation.md#installation-community-repos" >}}). Otherwise, account names may differ; run the `ps aux | grep unitd` command to be sure.
15+
{{< /note >}}
16+
17+
For further details, including permissions, see the
18+
[security checklist]({{< relref "/unit/howto/security.md#secutiry-apps" >}}).
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Install {{ app }}'s [app-link]. Here, we install it at **/path/to/app/**; use
2+
a real path in your configuration.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Install and configure {{ app }}'s [app-preq].
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Install [Unit]({{< relref "/unit/installation.md#installation-precomp-pkgs" >}}) with a {{ mod }} language module.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Assuming the JSON above was added to
2+
`config.json`. Run the following command as root:
3+
4+
```console
5+
# curl -X PUT --data-binary @config.json --unix-socket \
6+
/path/to/control.unit.sock \ # Path to Unit's control socket in your installation
7+
http://localhost/config/ # Path to the config section in Unit's control API
8+
```
9+
10+
{{< note >}}
11+
The [control socket]({{< relref "/unit/installation.md#configuration-socket" >}}) path may vary; run
12+
`unitd -h` or see
13+
[Startup and shutdown]({{< relref "/unit/howto/source.md#source-startup" >}}) for details.
14+
{{< /note >}}

content/includes/unit/version.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.34.1

content/ngf/support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ After opening a support ticket, F5 staff will request additional information to
1515

1616
## Kubernetes support plugin
1717

18-
The [nginx-supportpkg-for-k8s](https://github.com/nginxinc/nginx-supportpkg-for-k8s) plugin collects the information needed by F5 Technical Support to assist with troubleshooting your issue.
18+
The [nginx-supportpkg-for-k8s](https://github.com/nginx/nginx-supportpkg-for-k8s) plugin collects the information needed by F5 Technical Support to assist with troubleshooting your issue.
1919

2020
The plugin uses [krew](https://krew.sigs.k8s.io), the plugin manager for the Kubernetes [kubectl](https://kubernetes.io/docs/reference/kubectl/) command-line tool.
2121

@@ -30,7 +30,7 @@ The plugin may collect some or all of the following global and namespace-specifi
3030

3131
This plugin **does not** collect secrets or coredumps.
3232

33-
Visit the [project’s GitHub repository](https://github.com/nginxinc/nginx-supportpkg-for-k8s) for further details.
33+
Visit the [project’s GitHub repository](https://github.com/nginx/nginx-supportpkg-for-k8s) for further details.
3434

3535
---
3636

content/nginx-one/changelog.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ Using the NGINX One Console you can now:
9494
- Review the differences between the current and other saved configurations
9595
- Revert to older configurations as needed
9696

97-
### AI Assistant
97+
### F5 AI Assistant
9898

99-
In the F5 NGINX One Console, you can now select lines from your configuration files, and then select **Explain with AI**. The NGINX One AI Assistant explains those lines based on the official NGINX documentation.
99+
In the F5 NGINX One Console, you can now select lines from your configuration files, and then select **Explain with AI**. The F5 AI Assistant explains those lines based on the official NGINX documentation.
100100

101101
## November 7, 2024
102102

content/nginx-one/how-to/nginx-configs/add-instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ If you add an instance with SSL/TLS certificates, those certificates can match a
5151

5252
### If the certificate is already managed
5353

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**.
54+
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**.
5555

5656
NGINX One Console can manage your instances along with those certificates.
5757

content/nginx-one/rbac/rbac-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ The following table lists the available API groups that you can use to construct
4242
| f5xc-nginx-one-custom-settings-manage | Write | View and update NGINX One Console Settings. |
4343
| f5xc-nginx-one-custom-settings-read | Read | View NGINX One Console Settings. |
4444
| f5xc-nginx-one-custom-event-read | Read | View NGINX One Events. |
45-
| f5xc-nginx-one-custom-ai-assistant | Write | Interact with the NGINX One AI Assistant. |
45+
| f5xc-nginx-one-custom-ai-assistant | Write | Interact with the F5 AI Assistant. |
4646
| f5xc-nginx-one-custom-staged-config-manage | Write | View, create, update, and delete Staged Configs. |
4747
| f5xc-nginx-one-custom-staged-config-read | Read | View Staged Configs. |

content/nginx/admin-guide/basic-functionality/runtime-control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ where `<SIGNAL>` can be one of the following:
3232
- `quit` – Shut down gracefully (the `SIGQUIT` signal)
3333
- `reload` – Reload the configuration file (the `SIGHUP` signal)
3434
- `reopen` – Reopen log files (the `SIGUSR1` signal)
35-
- `stop` – Shut down immediately (or fast shutdown, the `SIGTERM` singal)
35+
- `stop` – Shut down immediately (or fast shutdown, the `SIGTERM` signal)
3636

3737
The `kill` utility can also be used to send a signal directly to the master process. The process ID of the master process is written, by default, to the **nginx.pid** file, which is located in the **/usr/local/nginx/logs** or **/var/run** directory.
3838

0 commit comments

Comments
 (0)