From 1d0cb1083f337e209e348f2746ea65498a8e5390 Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Sun, 13 Oct 2019 23:26:47 +0400 Subject: [PATCH] Update README (#171) And remove old tests leftover file --- README.md | 57 ++++++- tests/playbooks/nginx-http-template.yml | 211 ------------------------ 2 files changed, 52 insertions(+), 216 deletions(-) delete mode 100644 tests/playbooks/nginx-http-template.yml diff --git a/README.md b/README.md index de77a51..6b6771e 100644 --- a/README.md +++ b/README.md @@ -716,7 +716,12 @@ This is a sample playbook file for deploying the Ansible Galaxy NGINX role in a template_file: http/default.conf.j2 conf_file_name: default.conf conf_file_location: /etc/nginx/conf.d/ - port: 80 + listen: + listen_localhost: + #ip: 0.0.0.0 + port: 80 + opts: + - default_server server_name: localhost error_page: /usr/share/nginx/html autoindex: false @@ -737,8 +742,8 @@ This is a sample playbook file for deploying the Ansible Galaxy NGINX role in a sticky_cookie: false servers: frontend_server_1: - address: localhost - port: 80 + address: 0.0.0.0 + port: 8081 weight: 1 health_check: max_fails=3 fail_timeout=5s upstream_2: @@ -749,10 +754,52 @@ This is a sample playbook file for deploying the Ansible Galaxy NGINX role in a sticky_cookie: false servers: backend_server_1: - address: localhost - port: 8080 + address: 0.0.0.0 + port: 8082 weight: 1 health_check: max_fails=3 fail_timeout=5s + frontend: + template_file: http/default.conf.j2 + conf_file_name: frontend_default.conf + conf_file_location: /etc/nginx/conf.d/ + listen: + listen_localhost: + ip: 0.0.0.0 + port: 8081 + opts: [] + server_name: localhost + error_page: /usr/share/nginx/html + autoindex: false + web_server: + locations: + frontend_site: + location: / + proxy_hide_headers: + - X-Powered-By + html_file_location: /usr/share/nginx/html + html_file_name: index.html + autoindex: false + http_demo_conf: false + backend: + template_file: http/default.conf.j2 + conf_file_name: backend_default.conf + conf_file_location: /etc/nginx/conf.d/ + listen: + listen_localhost: + ip: 0.0.0.0 + port: 8082 + opts: [] + server_name: localhost + error_page: /usr/share/nginx/html + autoindex: false + web_server: + locations: + backend_site: + location: / + html_file_location: /usr/share/nginx/html + html_file_name: index.html + autoindex: false + http_demo_conf: false ``` diff --git a/tests/playbooks/nginx-http-template.yml b/tests/playbooks/nginx-http-template.yml deleted file mode 100644 index 25f39ef..0000000 --- a/tests/playbooks/nginx-http-template.yml +++ /dev/null @@ -1,211 +0,0 @@ ---- -- hosts: localhost - become: true - remote_user: root - roles: - - ansible-role-nginx - vars: - nginx_debug_output: true - nginx_http_template_enable: true - nginx_http_template: - app: - template_file: http/default.conf.j2 - conf_file_name: default.conf - conf_file_location: /etc/nginx/conf.d/ - listen: - listen_localhost: - ip: 0.0.0.0 - port: 80 - opts: - - default_server - server_name: localhost - error_page: /usr/share/nginx/html - proxy_hide_headers: - - X-Powered-By - add_headers: - strict_transport_security: - name: Strict-Transport-Security - value: max-age=15768000; includeSubDomains - always: true - reverse_proxy: - proxy_cache_path: - - path: /var/cache/nginx/proxy/frontend - keys_zone: - name: frontend_proxy_cache - size: 5m - levels: "1:2" - max_size: 5g - inactive: 30m - use_temp_path: true - - path: /var/cache/nginx/proxy/backend - keys_zone: - name: backend_proxy_cache - size: 10m - levels: "1:2" - max_size: 10g - inactive: 60m - use_temp_path: true - proxy_temp_path: - path: /var/cache/nginx/proxy/temp - proxy_cache_lock: true - proxy_cache_min_uses: 5 - proxy_cache_revalidate: true - proxy_cache_use_stale: - - error - - timeout - proxy_ignore_headers: - - Expires - locations: - frontend: - location: / - proxy_hide_headers: - - X-Powered-By - add_headers: - strict_transport_security: - name: Strict-Transport-Security - value: max-age=15768000; includeSubDomains - always: true - another_header: - name: Fancy-New-Header-To-Test - value: testing=true - always: false - proxy_pass: http://frontend_servers/ - proxy_cache: frontend_proxy_cache - proxy_temp_path: - path: /var/cache/nginx/proxy/frontend/temp - proxy_cache_lock: false - proxy_cache_min_uses: 3 - proxy_cache_revalidate: false - proxy_cache_use_stale: - - http_403 - - http_404 - proxy_ignore_headers: - - Vary - - Cache-Control - proxy_redirect: false - proxy_set_header: - header_host: - name: Host - value: $host - header_x_real_ip: - name: X-Real-IP - value: $remote_addr - header_x_forwarded_for: - name: X-Forwarded-For - value: $proxy_add_x_forwarded_for - header_x_forwarded_proto: - name: X-Forwarded-Proto - value: $scheme - proxy_buffering: false - backend: - location: /backend - proxy_pass: http://backend_servers/ - proxy_cache: backend_proxy_cache - proxy_temp_path: - path: /var/cache/nginx/proxy/backend/temp - proxy_cache_lock: true - proxy_cache_min_uses: 2 - proxy_cache_revalidate: true - proxy_cache_use_stale: - - http_500 - - http_502 - - http_503 - proxy_redirect: default - proxy_set_header: - header_host: - name: Host - value: $host - header_x_real_ip: - name: X-Real-IP - value: $remote_addr - header_x_forwarded_for: - name: X-Forwarded-For - value: $proxy_add_x_forwarded_for - header_x_forwarded_proto: - name: X-Forwarded-Proto - value: $scheme - proxy_cookie_path: - path: /web/ - replacement: / - upstreams: - frontend_upstream: - name: frontend_servers - lb_method: least_conn - zone_name: frontend_mem_zone - zone_size: 64k - sticky_cookie: false - servers: - frontend_server_1: - address: 0.0.0.0 - port: 8081 - weight: 1 - health_check: max_fails=3 fail_timeout=5s - backend_upstream: - name: backend_servers - lb_method: least_conn - zone_name: backend_mem_zone - zone_size: 64k - sticky_cookie: false - servers: - backend_server_1: - address: 0.0.0.0 - port: 8082 - weight: 1 - health_check: max_fails=3 fail_timeout=5s - returns: - return301: - location: ^~ /old-path - code: 301 - value: http://$host/new-path - frontend: - template_file: http/default.conf.j2 - conf_file_name: frontend_default.conf - conf_file_location: /etc/nginx/conf.d/ - listen: - listen_localhost: - port: 8081 - opts: [] - server_name: localhost - error_page: /usr/share/nginx/html - autoindex: false - web_server: - locations: - frontend_site: - location: / - proxy_hide_headers: - - X-Powered-By - html_file_location: /usr/share/nginx/html - html_file_name: frontend_index.html - autoindex: false - http_demo_conf: true - backend: - template_file: http/default.conf.j2 - conf_file_name: backend_default.conf - conf_file_location: /etc/nginx/conf.d/ - listen: - listen_localhost: - port: 8082 - opts: [] - server_name: localhost - error_page: /usr/share/nginx/html - autoindex: false - web_server: - locations: - backend_site: - location: / - html_file_location: /usr/share/nginx/html - html_file_name: backend_index.html - autoindex: false - http_demo_conf: true - nginx_html_demo_template_enable: true - nginx_html_demo_template: - frontend: - template_file: www/index.html.j2 - html_file_name: frontend_index.html - html_file_location: /usr/share/nginx/html - web_server_name: Frontend - backend: - template_file: www/index.html.j2 - html_file_name: backend_index.html - html_file_location: /usr/share/nginx/html - web_server_name: Backend