Merge pull request #30 from idealista/features/29

#29 Support debian stretch
idealista · Jun 30, 2017 · 2d1c34e · 2d1c34e
2 parents 99cd970 + 309721d
commit 2d1c34e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
 
 ## [Unreleased](https://github.com/idealista/nginx-role/tree/develop)
 
+## [1.5.0](https://github.com/idealista/nginx-role/tree/1.5.0) (2017-06-30)
+[Full Changelog](https://github.com/idealista/nginx-role/compare/1.4.0...1.5.0)
+
+### Added
+- *[#29](https://github.com/idealista/nginx-role/issues/29) Support debian stretch* @jmonterrubio
+
 ## [1.4.0](https://github.com/idealista/nginx-role/tree/1.4.0) (2017-05-03)
 [Full Changelog](https://github.com/idealista/nginx-role/compare/1.3.1...1.4.0)
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![Logo](logo.gif)
+![Logo](https://raw.githubusercontent.com/idealista/nginx-role/master/logo.gif)
 
 # Nginx Ansible role
 
@@ -62,9 +62,11 @@ files in the path defined by `nginx_extra_servers_path` or  `nginx_extra_servers
 ## Testing
 
 ```
-molecule test
+molecule test --platform=Debian9
 ```
 
+See molecule.yml to check possible testing platforms.
+
 ## Built With
 
 ![Ansible](https://img.shields.io/badge/ansible-2.2.1.0-green.svg)

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -35,7 +35,7 @@ nginx_extra_path: "extra-conf"
 nginx_extra_conf_path: "{{ nginx_conf_path }}/{{ nginx_extra_path }}"
 
 # Heathers_more
-headers_more_version: 0.27
+headers_more_version: 0.31
 
 # Lua
 lua_module_version: 0.10.7
@@ -59,4 +59,4 @@ nginx_compile_time_options_builtin_modules:
 
 nginx_compile_time_options_external_modules_paths:
   - /tmp/headers-more-nginx-module-{{ headers_more_version }}
-  - /tmp/lua-nginx-module-{{ lua_module_version }}
+  - /tmp/lua-nginx-module-{{ lua_module_version }}
diff --git a/molecule.yml b/molecule.yml
@@ -33,7 +33,9 @@ vagrant:
     - "landrush.tld = 'vm'"
     - "landrush.guest_redirect_dns = false"
   platforms:
-    - name: Debian
+    - name: Debian9
+      box: debian/stretch64
+    - name: Debian8
       box: debian/jessie64
 
   providers:

diff --git a/tests/playbook.yml b/tests/playbook.yml
@@ -12,5 +12,12 @@
       when: nginx_check|failed
 
 - hosts: all
+  pre_tasks:
+    - name: NGINX | Installing dependencies
+      apt:
+        pkg: "{{ item }}"
+        state: present
+      with_items:
+        - net-tools
   roles:
     - role: nginx-role
diff --git a/vars/main.yml b/vars/main.yml
@@ -2,6 +2,7 @@ required_libs:
   - build-essential
   - libpcre3-dev
   - libssl-dev
+  - zlib1g-dev
 
 nginx_url: http://nginx.org/download/nginx-{{ nginx_version }}.tar.gz
 headers_more_url: https://github.com/openresty/headers-more-nginx-module/archive/v{{ headers_more_version }}.tar.gz
@@ -23,4 +24,4 @@ nginx_compile_time_options:
   - { option: "error-log-path", value: "{{ nginx_error_log }}" }
   - { option: "http-log-path", value: "{{ nginx_access_log }}" }
   - { option: "pid-path", value: /run/nginx/nginx.pid }
-  - { option: "lock-path", value: /var/lock/nginx.lock }
+  - { option: "lock-path", value: /var/lock/nginx.lock }