From f5c1aa9085443fb4267a140da000c035fac01197 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Wed, 14 Dec 2016 10:13:21 +0100
Subject: [PATCH 1/2] Make use of forked roles (#78)

* Add working public private key pair

* Make use of forked roles
---
 .infra/Freyfile.hcl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.infra/Freyfile.hcl b/.infra/Freyfile.hcl
index 9c1806f..774abce 100644
--- a/.infra/Freyfile.hcl
+++ b/.infra/Freyfile.hcl
@@ -118,7 +118,7 @@ install {
     }
 
     roles {
-      role = "{{{init.paths.roles_dir}}}/unattended-upgrades/v1.2.0"
+      role = "{{{init.paths.roles_dir}}}/unattended-upgrades/1.2.0"
     }
 
     tasks {
@@ -166,7 +166,7 @@ setup {
     name  = "Setup tusd"
 
     roles {
-      role                  = "{{{init.paths.roles_dir}}}/upstart/v1.0.0"
+      role                  = "{{{init.paths.roles_dir}}}/upstart/1.0.0"
       upstart_command       = "./tusd -port=8080 -dir=/mnt/tusd-data -store-size=10737418240"
       upstart_description   = "tusd server"
       upstart_name          = "{{{config.global.appname}}}"
@@ -178,7 +178,7 @@ setup {
     }
 
     roles {
-      role = "{{{init.paths.roles_dir}}}/rsyslog/v3.0.2"
+      role = "{{{init.paths.roles_dir}}}/rsyslog/3.1.0"
       rsyslog_rsyslog_d_files "49-tusd" {
         directives = ["& stop"]
         rules {
@@ -189,7 +189,7 @@ setup {
     }
 
     roles {
-      role = "{{{init.paths.roles_dir}}}/fqdn/v1.0.0"
+      role = "{{{init.paths.roles_dir}}}/fqdn/1.0.0"
       fqdn = "{{lookup('env', 'FREY_DOMAIN')}}"
     }
 
@@ -215,7 +215,7 @@ deploy {
     name  = "Deploy tusd"
 
     roles {
-      role                  = "{{{init.paths.roles_dir}}}/deploy/v1.4.0"
+      role                  = "{{{init.paths.roles_dir}}}/deploy/1.4.0"
       ansistrano_get_url    = "https://github.com/tus/tusd/releases/download/0.5.2/tusd_linux_amd64.tar.gz"
       ansistrano_deploy_to  = "{{{config.global.approot}}}"
       ansistrano_deploy_via = "download_unarchive"

From d8b5c77cf52714be510a67ea37d7ce621b3bd5b8 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Wed, 14 Dec 2016 10:13:59 +0100
Subject: [PATCH 2/2] Make use of new apt role (#79)

* Add working public private key pair

* Make use of forked roles

* Make use of new apt role
---
 .infra/Freyfile.hcl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.infra/Freyfile.hcl b/.infra/Freyfile.hcl
index 774abce..fa1f79e 100644
--- a/.infra/Freyfile.hcl
+++ b/.infra/Freyfile.hcl
@@ -113,8 +113,11 @@ install {
     name  = "Install tusd"
 
     roles {
-      role         = "{{{init.paths.roles_dir}}}/apt/v1.0.0"
-      apt_packages = ["apg", "build-essential", "curl", "git-core", "htop", "iotop", "libpcre3", "logtail", "mlocate", "mtr", "psmisc", "telnet", "vim", "wget"]
+      role                    = "{{{init.paths.roles_dir}}}/apt/1.3.0"
+      apt_manage_sources_list = true
+      apt_src_enable          = false
+      apt_install             = ["apg", "build-essential", "curl", "git-core", "htop", "iotop", "libpcre3", "logtail", "mlocate", "mtr", "psmisc", "telnet", "vim", "wget"]
+      apt_install_state       = "present"
     }
 
     roles {