Merge pull request #24 from Oefenweb/consistency-changes

Consistency changes
Oefenweb · Nov 10, 2016 · 76e0aac · 76e0aac
2 parents 0aa5840 + 006be66
commit 76e0aac
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ## ufw
 
-[![Build Status](https://travis-ci.org/Oefenweb/ansible-ufw.svg?branch=master)](https://travis-ci.org/Oefenweb/ansible-ufw) [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-ufw-blue.svg)](https://galaxy.ansible.com/list#/roles/1613)
+[![Build Status](https://travis-ci.org/Oefenweb/ansible-ufw.svg?branch=master)](https://travis-ci.org/Oefenweb/ansible-ufw) [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-ufw-blue.svg)](https://galaxy.ansible.com/tersmitten/ufw)
 
 Set up ufw in Debian-like systems.
 
@@ -77,10 +77,6 @@ None
         protocol: udp
 ```
 
-#### TODO
-
-Make use of `omit`, available in **ansible 1.8**
-
 #### License
 
 MIT

diff --git a/Vagrantfile b/Vagrantfile
@@ -18,6 +18,13 @@ boxes = [
     :cpu => "50",
     :ram => "256"
   },
+  {
+    :name => "ubuntu-1604",
+    :box => "bento/ubuntu-16.04",
+    :ip => '10.0.0.13',
+    :cpu => "50",
+    :ram => "256"
+  },
   {
     :name => "debian-711",
     :box => "bento/debian-7.11",

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,19 +1,18 @@
 # defaults file for ufw
 ---
-# TODO: Cleanup next major release
-ufw_default_incoming_policy: "{{ ufw_default_policy | default('deny') }}"
+ufw_default_incoming_policy: deny
 ufw_default_outgoing_policy: allow
 
 ufw_logging: 'off'
 
 ufw_rules:
   - rule: allow
-    interface: eth0
+    interface: "{{ ansible_default_ipv4['interface'] }}"
     to_port: 22
     protocol: tcp
 
   - rule: allow
-    interface: eth0
+    interface: "{{ ansible_default_ipv4['interface'] }}"
     to_port: 23
     protocol: udp
 

diff --git a/meta/main.yml b/meta/main.yml
@@ -11,6 +11,7 @@ galaxy_info:
       versions:
         - precise
         - trusty
+        - xenial
     - name: Debian
       versions:
         - wheezy

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: install dependencies
   apt:
     name: "{{ item }}"
-    state: latest
+    state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
     cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
   with_items: "{{ ufw_dependencies }}"