Update template and service module syntax

21 files changed, 130 insertions, 51 deletions

diff --git a/roles/bittorrent/tasks/services.yml b/roles/bittorrent/tasks/services.yml
index 413ac57..dd485f0 100644
--- a/roles/bittorrent/tasks/services.yml
+++ b/roles/bittorrent/tasks/services.yml
@@ -8,4 +8,7 @@
   notify: reload sysctl
 
 - name: Activation et démarrage du service transmission-daemon
-  service: name=transmission-daemon state=started enabled=yes
+  service:
+    name: "transmission-daemon"
+    state: started
+    enabled: yes
diff --git a/roles/clients/tasks/kde.yml b/roles/clients/tasks/kde.yml
index 432d663..c94d8fb 100644
--- a/roles/clients/tasks/kde.yml
+++ b/roles/clients/tasks/kde.yml
@@ -5,8 +5,12 @@
   dnf: name=kdm state=present
 
 - name: Désactivation GDM
-  service: name=gdm enabled=no
+  service:
+    name: gdm
+    enabled: no
 
 - name: Activation KDM
-  service: name=kdm enabled=yes
+  service:
+    name: kdm
+    enabled: yes
   ignore_errors: yes
diff --git a/roles/common/handlers/ssh.yml b/roles/common/handlers/ssh.yml
index d63f84c..0105595 100644
--- a/roles/common/handlers/ssh.yml
+++ b/roles/common/handlers/ssh.yml
@@ -1,2 +1,4 @@
 - name: restart sshd
-  service: name=sshd state=restarted
+  service:
+    name: sshd
+    state: restarted
diff --git a/roles/common/tasks/host.yml b/roles/common/tasks/host.yml
index d5705d0..9e7f09b 100644
--- a/roles/common/tasks/host.yml
+++ b/roles/common/tasks/host.yml
@@ -1,2 +1,5 @@
 - name: Configuration du fichier des hôtes
-  template: src=hosts.j2 dest=/etc/hosts mode=644
+  template:
+    src: hosts.j2
+    dest: /etc/hosts
+    mode: 0644
diff --git a/roles/common/tasks/services.yml b/roles/common/tasks/services.yml
index 28369ee..6605494 100644
--- a/roles/common/tasks/services.yml
+++ b/roles/common/tasks/services.yml
@@ -1,10 +1,19 @@
 - name: Activation et démarrage du service Console Mouse Manager
-  service: name=gpm state=started enabled=yes
+  service:
+    name: gpm
+    state: started
+    enabled: yes
   when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
 
 - name: Activation et démarrage du service At
-  service: name=atd state=started enabled=yes
+  service:
+    name: atd
+    state: started
+    enabled: yes
 
 - name: Activation et démarrage du service Docker
-  service: name=docker state=started enabled=yes
+  service:
+    name: docker
+    state: started
+    enabled: yes
   ignore_errors: yes
diff --git a/roles/diagnostics/tasks/cron.yml b/roles/diagnostics/tasks/cron.yml
index 43c54f3..f826177 100644
--- a/roles/diagnostics/tasks/cron.yml
+++ b/roles/diagnostics/tasks/cron.yml
@@ -7,7 +7,10 @@
   when: ansible_pkg_mgr == "dnf"
 
 - name: Rapport disques durs
-  template: src=diskreport.sh.j2 dest=/etc/cron.daily/diskreport.sh mode=755
+  template:
+    src: diskreport.sh.j2
+    dest: /etc/cron.daily/diskreport.sh
+    mode: 0755
   when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
 
 - name: Rapport RPM Verify daily
@@ -21,7 +24,10 @@
     state: absent
 
 - name: Tests disques durs
-  template: src=diskcheck.sh.j2 dest=/etc/cron.weekly/diskcheck.sh mode=755
+  template:
+    src: diskcheck.sh.j2
+    dest: /etc/cron.weekly/diskcheck.sh
+    mode: 0755
   when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
 
 - name: Rapport d'uptime des machines physiques
diff --git a/roles/diagnostics/tasks/services.yml b/roles/diagnostics/tasks/services.yml
index 1baee1f..9f33307 100644
--- a/roles/diagnostics/tasks/services.yml
+++ b/roles/diagnostics/tasks/services.yml
@@ -1,9 +1,14 @@
 - name: Activation et démarrage du service lm_sensors
-  service: name=lm_sensors state=started enabled=yes
+  service:
+    name: lm_sensors
+    state: started
+    enabled: yes
   when: ansible_architecture == "x86_64" and
         ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
 
 - name: Activation et démarrage du service Smartd
-  service: name=smartd state=started enabled=yes
+  service:
+    name: smartd
+    state: started
+    enabled: yes
   when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
-
diff --git a/roles/dnsserver/handlers/named.yml b/roles/dnsserver/handlers/named.yml
index 8012f87..6e87ef8 100644
--- a/roles/dnsserver/handlers/named.yml
+++ b/roles/dnsserver/handlers/named.yml
@@ -1,5 +1,9 @@
 - name: reload named
-  service: name=named state=reloaded
+  service:
+    name: named
+    state: reloaded
 
 - name: restart named
-  service: name=named state=restarted
+  service:
+    name: named
+    state: restarted
diff --git a/roles/dnsserver/tasks/config.yml b/roles/dnsserver/tasks/config.yml
index 2b2dc27..eb7bd4d 100644
--- a/roles/dnsserver/tasks/config.yml
+++ b/roles/dnsserver/tasks/config.yml
@@ -1,15 +1,19 @@
 - name: Configuration de Bind
-  template: src=named.conf.j2 dest=/etc/named.conf
-            owner=root
-            group=named
-            mode=640
+  template:
+    src: named.conf.j2
+    dest: /etc/named.conf
+    owner: root
+    group: named
+    mode: 0640
   notify: restart named
 
 - name: Configuration de rndc
-  template: src=rndc.key.j2 dest=/etc/rndc.key
-            owner=root
-            group=named
-            mode=640
+  template:
+    src: rndc.key.j2
+    dest: /etc/rndc.key
+    owner: root
+    group: named
+    mode: 0640
 
 - name: Installation des fichiers de zone
   copy:
diff --git a/roles/dnsserver/tasks/services.yml b/roles/dnsserver/tasks/services.yml
index 16af550..3d052a7 100644
--- a/roles/dnsserver/tasks/services.yml
+++ b/roles/dnsserver/tasks/services.yml
@@ -1,2 +1,5 @@
 - name: Activation et démarrage de bind
-  service: name=named state=started enabled=yes
+  service:
+    name: named
+    state: started
+    enabled: yes
diff --git a/roles/mtaserver/handlers/postfix.yml b/roles/mtaserver/handlers/postfix.yml
index 87a6070..4904edd 100644
--- a/roles/mtaserver/handlers/postfix.yml
+++ b/roles/mtaserver/handlers/postfix.yml
@@ -1,8 +1,12 @@
 - name: reload postfix
-  service: name=postfix state=reloaded
+  service:
+    name: postfix
+    state: reloaded
 
 - name: restart postfix
-  service: name=postfix state=restarted
+  service:
+    name: postfix
+    state: restarted
 
 - name: aliasmap
   command: /usr/bin/newaliases
diff --git a/roles/mtaserver/tasks/config.yml b/roles/mtaserver/tasks/config.yml
index 9210934..84572bc 100644
--- a/roles/mtaserver/tasks/config.yml
+++ b/roles/mtaserver/tasks/config.yml
@@ -1,8 +1,10 @@
 - name: Configuration du démon
-  template: src=main.cf.j2 dest=/etc/postfix/main.cf
-            owner=root
-            group=root
-            mode=644
+  template:
+    src: main.cf.j2
+    dest: /etc/postfix/main.cf
+    owner: root
+    group: root
+    mode: 0644
   notify: restart postfix
 
 - name: Configuration du master
@@ -16,10 +18,12 @@
   notify: restart postfix
 
 - name: Installation des tables dynamiques
-  template: src={{ item.name }} dest=/etc/postfix/{{ item.filename }}
-            owner=root
-            group=root
-            mode=644
+  template:
+    src: "{{ item.name }}"
+    dest: "/etc/postfix/{{ item.filename }}"
+    owner: root
+    group: root
+    mode: 0644
   notify: postmap
   with_items:
     - { name: 'mydestination_table.j2', filename: 'mydestination_table' }
diff --git a/roles/mtaserver/tasks/services.yml b/roles/mtaserver/tasks/services.yml
index 76655b1..7aca6dc 100644
--- a/roles/mtaserver/tasks/services.yml
+++ b/roles/mtaserver/tasks/services.yml
@@ -1,2 +1,5 @@
 - name: Activation et démarrage de postfix
-  service: name=postfix state=started enabled=yes
+  service:
+    name: postfix
+    state: started
+    enabled: yes
diff --git a/roles/ntpserver/handlers/chrony.yml b/roles/ntpserver/handlers/chrony.yml
index dc5e217..44f2109 100644
--- a/roles/ntpserver/handlers/chrony.yml
+++ b/roles/ntpserver/handlers/chrony.yml
@@ -1,2 +1,4 @@
 - name: restart chrony
-  service: name=chronyd state=restarted
+  service:
+    name: chronyd
+    state: restarted
diff --git a/roles/ntpserver/handlers/ntp.yml b/roles/ntpserver/handlers/ntp.yml
index 736af19..a45bb3d 100644
--- a/roles/ntpserver/handlers/ntp.yml
+++ b/roles/ntpserver/handlers/ntp.yml
@@ -1,2 +1,4 @@
 - name: restart ntp
-  service: name=ntpd state=restarted
+  service:
+    name: ntpd
+    state: restarted
diff --git a/roles/ntpserver/tasks/config.yml b/roles/ntpserver/tasks/config.yml
index dd1f44b..3ddb476 100644
--- a/roles/ntpserver/tasks/config.yml
+++ b/roles/ntpserver/tasks/config.yml
@@ -1,10 +1,16 @@
 - name: Configuration du service NTP
-  template: src=ntp.conf.j2 dest=/etc/ntp.conf mode=644
+  template:
+    src: ntp.conf.j2
+    dest: /etc/ntp.conf
+    mode: 0644
   notify: restart ntp
   when: ansible_distribution == "CentOS"
 
 - name: Configuration du service Chrony
-  template: src=chrony.conf.j2 dest=/etc/chrony.conf mode=644
+  template:
+    src: chrony.conf.j2
+    dest: /etc/chrony.conf
+    mode: 0644
   notify: restart chrony
   when: ansible_distribution == "Fedora"
 
diff --git a/roles/ntpserver/tasks/services.yml b/roles/ntpserver/tasks/services.yml
index d1b585f..b0f9738 100644
--- a/roles/ntpserver/tasks/services.yml
+++ b/roles/ntpserver/tasks/services.yml
@@ -1,7 +1,13 @@
 - name: Activation et démarrage du service Chronyd
-  service: name=chronyd state=started enabled=yes
+  service:
+    name: chronyd
+    state: started
+    enabled: yes
   when: ansible_distribution == "Fedora"
 
 - name: Activation et démarrage du service NTP
-  service: name=ntpd state=started enabled=yes
+  service:
+    name: ntpd
+    state: started
+    enabled: yes
   when: ansible_distribution == "CentOS"
diff --git a/roles/proxy/tasks/config.yml b/roles/proxy/tasks/config.yml
index 09d3767..2dc561f 100644
--- a/roles/proxy/tasks/config.yml
+++ b/roles/proxy/tasks/config.yml
@@ -1,8 +1,10 @@
 - name: Configuration de squid
-  template: src=squid.conf.j2 dest=/etc/squid/squid.conf
-            owner=root
-            group=squid
-            mode=640
+  template:
+    src: squid.conf.j2
+    dest: /etc/squid/squid.conf
+    owner: root
+    group: squid
+    mode: 640
   notify: restart squid
 
 - name: Installation de l'unité systemd
diff --git a/roles/torrelay/handlers/tor.yml b/roles/torrelay/handlers/tor.yml
index 54a3aec..820ad02 100644
--- a/roles/torrelay/handlers/tor.yml
+++ b/roles/torrelay/handlers/tor.yml
@@ -1,2 +1,4 @@
 - name: restart tor
-  service: name=tor state=restarted
+  service:
+    name: tor
+    state: restarted
diff --git a/roles/torrelay/tasks/config.yml b/roles/torrelay/tasks/config.yml
index e8f755c..39f215a 100644
--- a/roles/torrelay/tasks/config.yml
+++ b/roles/torrelay/tasks/config.yml
@@ -17,7 +17,9 @@
     mode: 0644
 
 - name: Configuration du service
-  template: src=keys.j2 dest=/etc/tor/torrc
-            owner=root
-            group=root
-            mode=644
+  template:
+    src: keys.j2
+    dest: /etc/tor/torrc
+    owner: root
+    group: root
+    mode: 0644
diff --git a/roles/torrelay/tasks/services.yml b/roles/torrelay/tasks/services.yml
index e0c6876..e7919ee 100644
--- a/roles/torrelay/tasks/services.yml
+++ b/roles/torrelay/tasks/services.yml
@@ -1,2 +1,5 @@
 - name: Activation et démarrage du relai Tor
-  service: name=tor state=started enabled=yes
+  service:
+    name: tor
+    state: started
+    enabled: yes