Readme changes (#27)

Author: alessfg

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.2.0 (September 22, 2020)
+## 0.2.0 (September 24, 2020)
 
 BREAKING CHANGES:
 
@@ -13,8 +13,6 @@ Make sure you only use one variable or the other, since they will overwrite each
 FEATURES:
 
 *   Support for all NGINX App Protect directives has been added. You can find details on the supported directives on `defaults/main/template.yml`. This is the first module to be included using J2 macros. Expect to slowly see a refactor of various modules to use macros where possible.
-*   A new variable has been introduced:
-    *   `nginx_debug_tasks` -- Print task related information to give you a better insight into the current progress of the role.
 *   Add Alpine `3.12` to the list of supported platforms.
 *   Remove Alpine `3.8` from the list of supported platforms .
 *   Add NGINX Plus tests to TravisCI

README.md

@@ -1,5 +1,5 @@
-Ansible NGINX Role
-==================
+Ansible NGINX Configuration Role
+================================
 
 This role configures NGINX Open Source and NGINX Plus on your target host.
 
@@ -145,4 +145,4 @@ Author Information
 
 [Alessandro Fael Garcia](https://github.com/alessfg)
 
-© [NGINX, Inc.](https://www.nginx.com/) 2020
+© [F5 Networks, Inc.](https://www.f5.com/) 2020

molecule/common/playbooks/oss_requirements.yml

@@ -1,4 +1,4 @@
 ---
 roles:
   - name: nginxinc.nginx
-    version: 0.17.1
+    version: 0.17.2

molecule/common/playbooks/plus_prepare.yml

@@ -34,9 +34,6 @@
       include_role:
         name: nginxinc.nginx_app_protect
       vars:
-        nginx_app_protect_license:
-          certificate: ../files/license/nginx-repo.crt
-          key: ../files/license/nginx-repo.key
         nginx_app_protect_setup_license: false
         nginx_app_protect_remove_license: false
         nginx_app_protect_install_signatures: false

molecule/common/playbooks/plus_requirements.yml

@@ -1,6 +1,6 @@
 ---
 roles:
   - name: nginxinc.nginx
-    version: 0.17.1
+    version: 0.17.2
   - name: nginxinc.nginx_app_protect
     version: 0.3.1

molecule/default/converge.yml

@@ -43,10 +43,8 @@
             keyval: false
             server_tokens: "off"
           sub_filter:
-            # sub_filters: []
             last_modified: "off"
             once: "on"
-            # types: "text/html"
           http_global_autoindex: false
           custom_options:
             - master_process on;
@@ -109,11 +107,8 @@
                     value: max-age=15768000; includeSubDomains
                     always: true
                 sub_filter:
-                  # sub_filters: []
                   last_modified: "off"
                   once: "on"
-                  # types: "text/html"
-            # custom_options: []
                 reverse_proxy:
                   locations:
                     frontend:
@@ -166,10 +161,8 @@
                       proxy_buffering: false
                       client_max_body_size: 5m
                       sub_filter:
-                        # sub_filters: []
                         last_modified: "off"
                         once: "on"
-                        # types: "text/html"
                     backend:
                       location: /backend
                       proxy_pass: http://backend_servers/
@@ -296,7 +289,6 @@
                     - "'proxied_for_ip' '$http_x_forwarded_for'"
                   last_modified: "off"
                   once: "off"
-                  # types: "text/html"
                 web_server:
                   locations:
                     frontend_site:
@@ -307,10 +299,8 @@
                       html_file_name: frontend_index.html
                       autoindex: false
                   sub_filter:
-                    # sub_filters: []
                     last_modified: "off"
                     once: "off"
-                    # types: "text/html"
                   http_demo_conf: false
           backend:
             template_file: http/default.conf.j2
@@ -339,7 +329,6 @@
                     - "'proxied_for_ip' '$http_x_forwarded_for'"
                   last_modified: "off"
                   once: "off"
-                  # types: "text/html"
                 web_server:
                   locations:
                     backend_site:
@@ -362,11 +351,10 @@
                         - include fastcgi_params;
                         - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
                   sub_filter:
-                    # sub_filters: []
                     last_modified: "off"
                     once: "off"
-                    # types: "text/html"
                   http_demo_conf: false
+
         nginx_config_html_demo_template_enable: true
         nginx_config_html_demo_template:
           frontend:

molecule/plus/converge.yml

@@ -50,10 +50,8 @@
             keyval: false
             server_tokens: "off"
           sub_filter:
-            # sub_filters: []
             last_modified: "off"
             once: "on"
-            # types: "text/html"
           http_global_autoindex: false
           custom_options:
             - master_process on;
@@ -119,11 +117,8 @@
                     value: max-age=15768000; includeSubDomains
                     always: true
                 sub_filter:
-                  # sub_filters: []
                   last_modified: "off"
                   once: "on"
-                  # types: "text/html"
-            # custom_options: []
                 reverse_proxy:
                   locations:
                     frontend:
@@ -179,10 +174,8 @@
                       proxy_buffering: false
                       client_max_body_size: 5m
                       sub_filter:
-                        # sub_filters: []
                         last_modified: "off"
                         once: "on"
-                        # types: "text/html"
                     backend:
                       location: /backend
                       proxy_pass: http://backend_servers/
@@ -320,10 +313,8 @@
                       html_file_name: frontend_index.html
                       autoindex: false
                   sub_filter:
-                    # sub_filters: []
                     last_modified: "off"
                     once: "off"
-                    # types: "text/html"
                   http_demo_conf: false
           backend:
             template_file: http/default.conf.j2
@@ -352,7 +343,6 @@
                     - "'proxied_for_ip' '$http_x_forwarded_for'"
                   last_modified: "off"
                   once: "off"
-                  # types: "text/html"
                 web_server:
                   locations:
                     backend_site:
@@ -375,10 +365,8 @@
                         - include fastcgi_params;
                         - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
                   sub_filter:
-                    # sub_filters: []
                     last_modified: "off"
                     once: "off"
-                    # types: "text/html"
                   http_demo_conf: false
         nginx_config_html_demo_template_enable: true
         nginx_config_html_demo_template:

templates/http/default.conf.j2

@@ -12,7 +12,7 @@ upstream {{ item.value.upstreams[upstream].name }} {
 {% for server in item.value.upstreams[upstream].servers %}
     server {{ item.value.upstreams[upstream].servers[server].address }}{{(":" + item.value.upstreams[upstream].servers[server].port | string) if item.value.upstreams[upstream].servers[server].port is defined}} {% if item.value.upstreams[upstream].servers[server].down is defined and item.value.upstreams[upstream].servers[server].down %}down{% else %}weight={{ item.value.upstreams[upstream].servers[server].weight | default("1") }} {{ item.value.upstreams[upstream].servers[server].health_check | default("") }}{% endif %};
 {% endfor %}
-{% if item.value.upstreams[upstream].sticky_cookie %}
+{% if item.value.upstreams[upstream].sticky_cookie is defined and item.value.upstreams[upstream].sticky_cookie %}
     sticky cookie srv_id expires=1h  path=/;
 {% endif %}
 {% if item.value.upstreams[upstream].custom_options is defined and item.value.upstreams[upstream].custom_options | length %}