From ce37282feb528af45bf0b595cab33e0ebe397630 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Wed, 12 Jul 2017 10:23:21 +0200
Subject: [PATCH] Effectively change the timezone

---
 evolinux-base/handlers/main.yml |  4 ++++
 evolinux-base/tasks/system.yml  | 19 +++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/evolinux-base/handlers/main.yml b/evolinux-base/handlers/main.yml
index dccd6e9f..3458490c 100644
--- a/evolinux-base/handlers/main.yml
+++ b/evolinux-base/handlers/main.yml
@@ -52,6 +52,10 @@
     name: apache2
     state: reloaded
 
+- name: restart cron
+  service:
+    name: cron
+    state: restarted
 
 - name: newaliases
   command: newaliases
diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml
index 28f0c82d..f8eb62e8 100644
--- a/evolinux-base/tasks/system.yml
+++ b/evolinux-base/tasks/system.yml
@@ -25,19 +25,11 @@
   when: evolinux_system_locales and default_locales | changed
 
 - name: Setting default timezone
-  lineinfile:
-    dest: /etc/timezone
-    regexp: '^\w+/\w+$'
-    line: "{{ evolinux_system_timezone | mandatory }}"
-    insertbefore: BOF
-    create: yes
-  register: change_timezone
+  timezone:
+    name: "{{ evolinux_system_timezone | mandatory }}"
+  notify: restart cron
   when: evolinux_system_timezone != False
 
-- name: Reconfigure tzdata
-  command: dpkg-reconfigure --frontend noninteractive tzdata
-  when: evolinux_system_timezone != False and change_timezone | changed
-
 # TODO : find a way to force the console-data configuration
 # non-interactively (like tzdata ↑)
 
@@ -48,7 +40,10 @@
     dest: /etc/vim/vimrc
     regexp: 'let g:skip_defaults_vim ='
     line: 'let g:skip_defaults_vim = 1'
-  when: evolinux_system_vim_skip_defaults
+  when:
+  - evolinux_system_vim_skip_defaults
+  - ansible_distribution == "Debian"
+  - ansible_distribution_major_version | version_compare('9.0', '>=')
 
 - name: Setting vim as default editor
   alternatives: