Merge pull request #18 from mvdriel/fixed-typos

Fixed typo: uwf ==> ufw
Oefenweb · Jul 10, 2015 · 86b4de7 · 86b4de7
2 parents 2f05cde + 00a52a3
commit 86b4de7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -10,9 +10,9 @@ None
 
 #### Variables
 
-* `uwf_default_policy` [default: `deny`]: Default policy
-* `uwf_logging` [default: `off`]: Log level
-* `uwf_rules` [default: see `defaults/main.yml`]: Rules to apply
+* `ufw_default_policy` [default: `deny`]: Default policy
+* `ufw_logging` [default: `off`]: Log level
+* `ufw_rules` [default: see `defaults/main.yml`]: Rules to apply
 
 ## Dependencies
 
@@ -29,23 +29,23 @@ None
 
 ##### Allow ssh
 ```yaml
-uwf_rules:
+ufw_rules:
   - rule: allow
     to_port: 22
     protocol: tcp
 ```
 
 ##### Allow all traffic on eth1
 ```yaml
-uwf_rules:
+ufw_rules:
   - rule: allow
     interface: eth1
     to_port: ''
 ```
 
 ##### Allow snmp traffic from 1.2.3.4 on eth0
 ```yaml
-uwf_rules:
+ufw_rules:
   - rule: allow
     interface: eth0
     from_ip: 1.2.3.4

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,8 +1,8 @@
 ---
 # defaults file for ufw
-uwf_default_policy: deny
-uwf_logging: 'off'
-uwf_rules:
+ufw_default_policy: deny
+ufw_logging: 'off'
+ufw_rules:
   - rule: allow
     interface: eth0
     to_port: 22

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -33,7 +33,7 @@
 
 - name: default policy
   ufw:
-    policy: "{{ uwf_default_policy }}"
+    policy: "{{ ufw_default_policy }}"
   notify: reload ufw
   tags: [configuration, ufw, ufw-default-policy]
 
@@ -48,13 +48,13 @@
     to_port: "{{ item.to_port | default('') }}"
     protocol: "{{ item.protocol | default('any') }}"
     log: "{{ item.log | default(False) }}"
-  with_items: uwf_rules
+  with_items: ufw_rules
   notify: reload ufw
   tags: [configuration, ufw, ufw-apply]
 
 - name: logging
   ufw:
-    logging: "{{ uwf_logging }}"
+    logging: "{{ ufw_logging }}"
   notify: reload ufw
   tags: [configuration, ufw, ufw-logging]
 

diff --git a/templates/etc/ansible/facts.d/ufw.fact.j2 b/templates/etc/ansible/facts.d/ufw.fact.j2
@@ -1,5 +1,5 @@
 {
-  "default_policy": {{ uwf_default_policy | to_nice_json }},
-  "logging": {{ uwf_logging | to_nice_json }},
-  "rules": {{ uwf_rules | to_nice_json }}
+  "default_policy": {{ ufw_default_policy | to_nice_json }},
+  "logging": {{ ufw_logging | to_nice_json }},
+  "rules": {{ ufw_rules | to_nice_json }}
 }