Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#29 Support debian stretch #30

Merged
merged 1 commit into from
Jun 30, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![Logo](logo.gif)
![Logo](https://raw.githubusercontent.com/idealista/nginx-role/master/logo.gif)

# Nginx Ansible role

Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
4 changes: 3 additions & 1 deletion molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions tests/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }