Skip to content

Commit

Permalink
Replace non-existent GitHub actions key (#238)
Browse files Browse the repository at this point in the history
  • Loading branch information
alessfg authored Jan 29, 2023
1 parent 3e4f941 commit 44e6c14
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 35 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Main global owner #
#####################

* @alessfg @aknot242
/.github/workflows/
*.md
2 changes: 1 addition & 1 deletion .github/workflows/galaxy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Ansible Galaxy import
"on":
on:
release:
types:
- published
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
name: Molecule CI/CD
"on":
on:
pull_request:
branches:
- main
push:
branches:
- main
ignore-tags:
- "*"
tags-ignore:
- "**"
schedule:
- cron: "0 0 1 * *"
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Release Drafter
"on":
on:
pull_request:
types:
- opened
Expand Down
9 changes: 6 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 0.8.2 (Unreleased)
## 0.9.0 (Unreleased)

FEATURES:

Expand All @@ -14,11 +14,14 @@ FEATURES:

ENHANCEMENTS:

Bump the Ansible `community.general` collection to `6.2.0`, `community.crypto` collection to `2.10.0` and `community.docker` collection to `3.4.0`.
* Standardize code from dot to array notation to keep in with the standards set by the other roles in the Ansible NGINX core collection.
* Bump the minimum version of Ansible core required to run the role to `2.12` (`2.11` is no longer supported by Ansible).
* Bump the Ansible `community.general` collection to `6.2.0`, `community.crypto` collection to `2.10.0` and `community.docker` collection to `3.4.0`.

BUG FIXES:

The Alpine Linux `libelf` dependency is no longer automatically installed by NGINX App Protect DoS so we need to explicitly install it as a prerequisite.
* The Alpine Linux `libelf` dependency is no longer automatically installed by NGINX App Protect DoS so we need to explicitly install it as a prerequisite.
* The `ignore-tags` GitHub actions key does not exist. Replace it with the correct key, `tags-ignore`.

TESTS:

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ If you wish to install NGINX App Protect WAF or NGINX App Protect DoS using this

### Ansible

* This role is developed and tested with [maintained](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) versions of Ansible core (above `2.11`).
* This role is developed and tested with [maintained](https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html) versions of Ansible core (above `2.12`).
* When using Ansible core, you will also need to install the following collections:

```yaml
Expand Down Expand Up @@ -50,13 +50,13 @@ If you wish to install NGINX App Protect WAF or NGINX App Protect DoS using this
* Instructions on how to install Molecule can be found in the [Molecule website](https://molecule.readthedocs.io/en/latest/installation.html). *You will also need to install the Molecule Docker driver.*
* To run the Molecule tests, you must copy your NGINX App Protect license to the role's [`files/license`](https://github.com/nginxinc/ansible-role-nginx-app-protect/blob/main/files/license/) folder.

You can alternatively add your NGINX App Protect repository certificate and key to the local environment. Run the following commands to export these files as base64-encoded variables and execute the Molecule tests:
You can alternatively add your NGINX App Protect repository certificate and key to the local environment. Run the following commands to export these files as base64-encoded variables and execute the Molecule tests:

```bash
export NGINX_CRT=$( cat <path to your certificate file> | base64 )
export NGINX_KEY=$( cat <path to your key file> | base64 )
molecule test
```
```bash
export NGINX_CRT=$( cat <path to your certificate file> | base64 )
export NGINX_KEY=$( cat <path to your key file> | base64 )
molecule test
```

## Installation

Expand Down
10 changes: 5 additions & 5 deletions handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@

- name: (Handler - NGINX App Protect) Print NGINX error if syntax check fails
ansible.builtin.debug:
var: config_check.stderr_lines
failed_when: config_check.rc != 0
var: config_check['stderr_lines']
failed_when: config_check['rc'] != 0
when:
- config_check.stderr_lines is defined
- config_check.stderr_lines != []
- config_check.rc != 0
- config_check['stderr_lines'] is defined
- config_check['stderr_lines'] != []
- config_check['rc'] != 0
listen: (Handler - NGINX App Protect) Run NGINX
21 changes: 7 additions & 14 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,25 @@
---
galaxy_info:
author: nginxinc
description: Official Ansible role for NGINX App Protect WAF and DoS
description: Official Ansible role for installing and configuring NGINX App Protect WAF and DoS
role_name: nginx_app_protect
company: F5, Inc.

license: Apache License, Version 2.0

min_ansible_version: "2.11"
min_ansible_version: '2.12'

platforms:
- name: Alpine
versions:
- all
versions: [all]
- name: Amazon Linux 2
versions:
- all
versions: [all]
- name: EL
versions:
- "7"
- "8"
versions: ['7', '8']
- name: Debian
versions:
- bullseye
versions: [bullseye]
- name: Ubuntu
versions:
- bionic
- focal
versions: [bionic, focal]

galaxy_tags:
- waf
Expand Down

0 comments on commit 44e6c14

Please sign in to comment.