From c51f1ef8b4b0b311f87fa540386746bcb420bc48 Mon Sep 17 00:00:00 2001
From: Matthieu Saulnier <casper@casperlefantom.net>
Date: Mon, 23 Sep 2019 22:14:22 +0200
Subject: Add missing quotes and fix many syntax errors

---
 roles/clients/tasks/enlightenment.yml        |  2 +-
 roles/clients/vars/main.yml                  | 10 +++++-----
 roles/common/tasks/pkgs.yml                  |  2 +-
 roles/common/vars/main.yml                   | 10 +++++-----
 roles/diagnostics/templates/rkhunter.conf.j2 |  4 ++--
 roles/torrelay/templates/torrc.j2            |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/roles/clients/tasks/enlightenment.yml b/roles/clients/tasks/enlightenment.yml
index 51099f9..7008deb 100644
--- a/roles/clients/tasks/enlightenment.yml
+++ b/roles/clients/tasks/enlightenment.yml
@@ -1,4 +1,4 @@
 - name: Installation des paquets Enlightenment
   package:
-    name: @enlightenment
+    name: "@enlightenment"
     state: present
diff --git a/roles/clients/vars/main.yml b/roles/clients/vars/main.yml
index c6e809f..7c5b7e9 100644
--- a/roles/clients/vars/main.yml
+++ b/roles/clients/vars/main.yml
@@ -1,11 +1,11 @@
 defaultversion: 30
-oldversion: {{ defaultversion | int - 1 }}
-futureversion: {{ defaultversion | int + 1 }}
+oldversion: "{{ defaultversion | int - 1 }}"
+futureversion: "{{ defaultversion | int + 1 }}"
 
 mockversions:
-  - {{ defaultversion }}
-  - {{ oldversion }}
-  - {{ futureversion }}
+  - "{{ defaultversion }}"
+  - "{{ oldversion }}"
+  - "{{ futureversion }}"
 
 mocktypes:
   - by_remi
diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml
index f5501ed..210af7c 100644
--- a/roles/common/tasks/pkgs.yml
+++ b/roles/common/tasks/pkgs.yml
@@ -26,7 +26,6 @@
     - elinks
     - mutt
     - nfs-utils
-    - nfswatch
     - tcpdump
     - bind-utils
     - tar
@@ -66,6 +65,7 @@
     - scapy
     - steghide
     - util-linux-user
+    - nfswatch
   when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22
 
 - name: Installation d'un programme de gravure
diff --git a/roles/common/vars/main.yml b/roles/common/vars/main.yml
index 64759f1..a658a1b 100644
--- a/roles/common/vars/main.yml
+++ b/roles/common/vars/main.yml
@@ -1,9 +1,9 @@
-minkernel: 2
-maxkernel: 4
-logo_release: 28
-mirrorlimitdown : 27
+minkernel: "2"
+maxkernel: "4"
+logo_release: "28"
+mirrorlimitdown : "27"
 #
 # Mirror list from https://admin.fedoraproject.org/mirrormanager/mirrors
 #
 optmirror: "http://fedora.mirrors.telekom.ro"
-auxssh: 54444
+auxssh: "54444"
diff --git a/roles/diagnostics/templates/rkhunter.conf.j2 b/roles/diagnostics/templates/rkhunter.conf.j2
index f2f70d9..dd689ba 100644
--- a/roles/diagnostics/templates/rkhunter.conf.j2
+++ b/roles/diagnostics/templates/rkhunter.conf.j2
@@ -613,8 +613,8 @@ SCRIPTWHITELIST=/usr/bin/ldd
 SCRIPTWHITELIST=/usr/bin/groups
 SCRIPTWHITELIST=/usr/bin/GET
 {% if ansible_distribution == "CentOS" -%}
-SCRIPTWHITELIST=/sbin/ifup                                                                               
-SCRIPTWHITELIST=/sbin/ifdown                                                                             
+SCRIPTWHITELIST=/sbin/ifup
+SCRIPTWHITELIST=/sbin/ifdown
 {% endif -%}
 
 #
diff --git a/roles/torrelay/templates/torrc.j2 b/roles/torrelay/templates/torrc.j2
index fafce1f..e3ec7a5 100644
--- a/roles/torrelay/templates/torrc.j2
+++ b/roles/torrelay/templates/torrc.j2
@@ -30,11 +30,11 @@ HiddenServicePort {{ service.port }} {{ service.host }}
 
 {% if orport is defined and dirport is defined %}
 ORPort {{ orport }}
-ORPort {{ ansible_default_ipv6.address }}:{{ orport }}
+ORPort [{{ ansible_default_ipv6.address }}]:{{ orport }}
 DirPort {{ dirport }}
 {% elif orport is defined and dirport is not defined %}
 ORPort {{ orport }}
-ORPort {{ ansible_default_ipv6.address }}:{{ orport }}
+ORPort [{{ ansible_default_ipv6.address }}]:{{ orport }}
 BridgeRelay 1
 {% endif %}
 
-- 
cgit