diff --git a/roles/nginx/README.md b/roles/nginx/README.md index a8be0d6..88467c3 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -34,7 +34,7 @@ None. Defaults to `true`. - `nginx__configurations`: List of nginx configurations to ensure are deployed. - `nginx__configurations.*.name`: This name with `.conf` appended will be used for the configurations file name under `/etc/nginx/conf.d/`. - `tls`, `redirect` and `logging` are reserved names. + `tls` and `redirect` are reserved names. - `nginx__configurations.*.content`: This configurations content. - `nginx__use_custom_nginx_conf`: Whether or not to use a custom `/etc/nginx/nginx.conf`. If set to true, you must provide the content for a custom `nginx.conf` via `nginx__custom_nginx_conf`. @@ -43,6 +43,10 @@ None. Needs `nginx__use_custom_nginx_conf` to be set to true to work. You should probably still make sure that your custom `nginx.conf` includes `/etc/nginx/conf.d/*.conf`, so that the other configuration files still work. +## `hosts` + +The `hosts` for this role need to be the machines, for which you want to make sure the `nginx` package is installed from the NGINX repos and a desirable baseline of NGINX configs is deployed. + ## Config Template Here's a config template, which can be used for new NGINX site configs, which you can supply to this role using the `nginx__configurations` argument. diff --git a/roles/nginx/tasks/make_sure_nginx_configuration_names_are_valid.yaml b/roles/nginx/tasks/make_sure_nginx_configuration_names_are_valid.yaml index 234b12c..54ea6f5 100644 --- a/roles/nginx/tasks/make_sure_nginx_configuration_names_are_valid.yaml +++ b/roles/nginx/tasks/make_sure_nginx_configuration_names_are_valid.yaml @@ -3,5 +3,4 @@ msg: "You used the following name: `{{ item.name }}`. Please make sure to not use the following names: `tls`, `redirect`." when: item.name == "tls" or item.name == "redirect" - or item.name == "logging" loop: "{{ nginx__configurations }}"