Skip to content

Commit 5e918e6

Browse files
authored
Remove NGINX configuration features from role (#353)
1 parent 57947a2 commit 5e918e6

35 files changed

+15
-2437
lines changed

Diff for: .github/workflows/molecule.yml

-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ jobs:
2626
- source
2727
- source_alpine
2828
- source_centos
29-
- stable_push_alpine
30-
- stable_push_centos
31-
- template
32-
- template_alpine
33-
- template_centos
3429
steps:
3530
- name: Check out the codebase
3631
uses: actions/checkout@v2

Diff for: CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 0.19.0 (Unreleased)
4+
5+
BREAKING CHANGES:
6+
7+
**The NGINX configuration functionalities included in this role have been removed as of release 0.19.0.** There now is a separate role to manage and create NGINX configurations available [here](https://github.com/nginxinc/ansible-role-nginx-config). Any new issues or PRs related to configuring NGINX should be submitted in the new NGINX configuration Ansible role repository. New issues or PRs related to configuring NGINX submitted in this repository will not be worked on.
8+
39
## 0.18.2 (December 22, 2020)
410

511
ENHANCEMENTS:
@@ -23,7 +29,7 @@ Fix issue whereas SELinux state would not be correctly set back to `enforcing` w
2329

2430
BREAKING CHANGES:
2531

26-
**The NGINX Unit functionalities included in this role have been removed as of release 0.18.0.** There now is a separate role to install NGINX Unit available [here](https://github.com/nginxinc/ansible-role-nginx-unit). Any new issues or PRs related to NGINX Unit should be submitted in the new NGINX Unit repository. New issues or PRs related to NGINX Unit submitted in this repository will not be worked on.
32+
**The NGINX Unit functionalities included in this role have been removed as of release 0.18.0.** There now is a separate role to install NGINX Unit available [here](https://github.com/nginxinc/ansible-role-nginx-unit). Any new issues or PRs related to NGINX Unit should be submitted in the new NGINX Unit Ansible role repository. New issues or PRs related to NGINX Unit submitted in this repository will not be worked on.
2733

2834
## 0.17.4 (November 12, 2020)
2935

Diff for: README.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ This role installs NGINX Open Source, NGINX Plus, or the NGINX Amplify agent on
1414

1515
With the advent of Ansible collections and the release of the [NGINX Core Ansible collection](https://github.com/nginxinc/ansible-collection-nginx), the decision has been made to split this role into three smaller roles and reduce the overhead of this role:
1616
* The NGINX Ansible role will keep working as is and be used to install and setup NGINX.
17-
* **The NGINX configuration functionalities included in this role will be removed in an upcoming release at some stage after December 1st 2020.** There now is a separate role to manage and create NGINX configurations available [here](https://github.com/nginxinc/ansible-role-nginx-config). Any new issues or PRs related to configuring NGINX should be submitted in the new NGINX Config repository. New issues or PRs related to configuring NGINX submitted in this repository will not be worked on.
18-
* **The NGINX Unit functionalities included in this role have been removed as of release 0.18.0.** There now is a separate role to install NGINX Unit available [here](https://github.com/nginxinc/ansible-role-nginx-unit). Any new issues or PRs related to NGINX Unit should be submitted in the new NGINX Unit repository. New issues or PRs related to NGINX Unit submitted in this repository will not be worked on. This disclaimer will be removed in a future release.
17+
* **The NGINX configuration functionalities included in this role have been removed as of release 0.19.0.** There now is a separate role to manage and create NGINX configurations available [here](https://github.com/nginxinc/ansible-role-nginx-config). Any new issues or PRs related to configuring NGINX should be submitted in the new NGINX configuration Ansible role repository. New issues or PRs related to configuring NGINX submitted in this repository will not be worked on. This disclaimer will be removed in a future release.
18+
* **The NGINX Unit functionalities included in this role have been removed as of release 0.18.0.** There now is a separate role to install NGINX Unit available [here](https://github.com/nginxinc/ansible-role-nginx-unit). Any new issues or PRs related to NGINX Unit should be submitted in the new NGINX Unit Ansible role repository. New issues or PRs related to NGINX Unit submitted in this repository will not be worked on. This disclaimer will be removed in a future release.
1919

2020
## Requirements
2121

@@ -133,8 +133,6 @@ This role has multiple variables. The descriptions and defaults for all these va
133133
|----|-----------|
134134
|**[`main.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/defaults/main/main.yml)**|NGINX installation variables|
135135
|**[`amplify.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/defaults/main/amplify.yml)**|NGINX Amplify agent installation variables|
136-
|**[`template.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/defaults/main/template.yml)**|NGINX configuration templating variables|
137-
|**[`upload.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/defaults/main/upload.yml)**|NGINX configuration/HTML/SSL upload variables|
138136
|**[`linux.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/defaults/main/linux.yml)**|Linux installation variables|
139137
|**[`bsd.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/defaults/main/bsd.yml)**|BSD installation variables|
140138

@@ -154,8 +152,6 @@ Working functional playbook examples can be found in the **[`molecule/common/pla
154152
|**[`module_converge.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/molecule/common/playbooks/module_converge.yml)**|Install various NGINX supported modules|
155153
|**[`plus_converge.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/molecule/common/playbooks/plus_converge.yml)**|Install NGINX Plus and various NGINX Plus supported modules|
156154
|**[`source_converge.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/molecule/common/playbooks/source_converge.yml)**|Install NGINX from source|
157-
|**[`stable_push_converge.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/molecule/common/playbooks/stable_push_converge.yml)**|Install NGINX using the stable branch and push a preexisting config from your system to your NGINX instance|
158-
|**[`template_converge.yml`](https://github.com/nginxinc/ansible-role-nginx/blob/main/molecule/common/playbooks/template_converge.yml)**|Use the NGINX configuration templating variables to create an NGINX configuration file|
159155

160156
Do note that if you install this repository via Ansible Galaxy, you will have to replace the role variable in the sample playbooks from `ansible-role-nginx` to `nginxinc.nginx`.
161157

Diff for: defaults/main/main.yml

-20
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ nginx_enable: true
88
# Default is true.
99
nginx_install: true
1010

11-
## DEPRECATED -- Use nginxinc.nginx_config role instead (https://github.com/nginxinc/ansible-role-nginx-config)
12-
# Enable NGINX configuration options.
13-
# Variables for these options can be found in `./template.yml` and `./upload.yml`.
14-
# Default is false.
15-
nginx_configure: false
16-
1711
# Start NGINX service.
1812
# Default is true.
1913
nginx_start: true
@@ -112,17 +106,3 @@ nginx_modules: []
112106
# - subs-filter # NGINX Plus
113107
# - waf # NGINX Plus
114108
# - xslt
115-
116-
## DEPRECATED -- Use nginxinc.nginx_config role instead (https://github.com/nginxinc/ansible-role-nginx-config)
117-
# Remove previously existing NGINX configuration files.
118-
# You can specify a list of paths you wish to remove.
119-
# You can also choose whether to recurse through the paths specified.
120-
# Alternatively you can specify the list of files you wish to remove.
121-
# Default is false.
122-
nginx_cleanup_config: false
123-
nginx_cleanup_config_paths:
124-
- directory:
125-
- /etc/nginx/conf.d
126-
recurse: false
127-
# nginx_cleanup_config_files:
128-
# - /etc/nginx/conf.d/default.conf

0 commit comments

Comments
 (0)