From 6ab114d0e0197c8ab87f5edbecc6a8705f4742c2 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Wed, 1 Mar 2017 14:14:56 +0100
Subject: [PATCH] Make use of fqdn and timezone role (#115)

---
 .infra/Freyfile.hcl | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.infra/Freyfile.hcl b/.infra/Freyfile.hcl
index 91221cb..4fb551c 100644
--- a/.infra/Freyfile.hcl
+++ b/.infra/Freyfile.hcl
@@ -131,6 +131,12 @@ install {
     roles {
       role = "{{{init.paths.roles_dir}}}/unattended-upgrades/1.3.1"
     }
+    roles {
+      role = "{{{init.paths.roles_dir}}}/fqdn/1.2.1"
+    }
+    roles {
+      role = "{{{init.paths.roles_dir}}}/timezone/1.0.0"
+    }
     tasks {
       lineinfile = "dest=/home/{{{config.global.ssh.user}}}/.bashrc line=\"alias wtf='sudo tail -f /var/log/*{log,err} /var/log/{dmesg,messages,*{,/*}{log,err}}'\" owner={{{config.global.ssh.user}}} group={{{config.global.ssh.user}}} mode=0644 backup=yes"
       name       = "Common | Add convenience shortcut wtf"
@@ -143,15 +149,6 @@ install {
       name = "Common | Set motd"
       copy = "content='Welcome to {{lookup('env', 'FREY_DOMAIN')}}' dest=/etc/motd owner=root group=root mode=0644 backup=yes"
     }
-    tasks {
-      name   = "Common | Set timezone variables"
-      copy   = "content='Etc/UTC' dest=/etc/timezone owner=root group=root mode=0644 backup=yes"
-      notify = ["Common | Update timezone"]
-    }
-    handlers {
-      name    = "Common | Update timezone"
-      command = "dpkg-reconfigure --frontend noninteractive tzdata"
-    }
   }
 }
 
@@ -180,9 +177,6 @@ setup {
         }
       }
     }
-    roles {
-      role = "{{{init.paths.roles_dir}}}/fqdn/1.2.1"
-    }
     tasks {
       file = "path=/mnt/tusd-data state=directory owner=www-data group=ubuntu mode=ug+rwX,o= recurse=yes"
       name = "tusd | Create tusd data dir"