From 598ca78fa7b3f11a9be23f69f5fae129e38e3969 Mon Sep 17 00:00:00 2001
From: Kevin van Zonneveld <vanzonneveld@gmail.com>
Date: Wed, 11 Jan 2017 10:25:28 +0100
Subject: [PATCH] Upgrade Frey to v0.3.27 /cc @tersmitten (#85)

* Upgrade Frey to v0.3.27 /cc @tersmitten

* Add forgotten and misspelled role variables

* Make it easier to override settings and clear that this is a private file
---
 .infra/Freyfile.hcl             | 18 +++++++++---------
 .infra/group_vars/all/_frey.yml |  6 ++++++
 2 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 .infra/group_vars/all/_frey.yml

diff --git a/.infra/Freyfile.hcl b/.infra/Freyfile.hcl
index 4cb334c..107aa1b 100644
--- a/.infra/Freyfile.hcl
+++ b/.infra/Freyfile.hcl
@@ -106,11 +106,11 @@ install {
     hosts = "tusd"
     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_install = ["apg", "build-essential", "curl", "git-core", "htop", "iotop", "libpcre3", "logtail", "mlocate", "mtr", "psmisc", "telnet", "vim", "wget"]
     }
     roles {
-      role = "{{{init.paths.roles_dir}}}/unattended-upgrades/v1.2.0"
+      role = "{{{init.paths.roles_dir}}}/unattended-upgrades/1.3.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"
@@ -141,7 +141,7 @@ setup {
     hosts = "tusd"
     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 -max-size=1000000000 -behind-proxy"
       upstart_description   = "tusd server"
       upstart_name          = "{{{config.global.appname}}}"
@@ -152,7 +152,7 @@ setup {
       upstart_user          = "www-data"
     }
     roles {
-      role = "{{{init.paths.roles_dir}}}/rsyslog/v3.0.1"
+      role = "{{{init.paths.roles_dir}}}/rsyslog/3.1.0"
       rsyslog_rsyslog_d_files "49-tusd" {
         directives = ["& stop"]
         rules {
@@ -162,7 +162,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')}}"
     }
     tasks {
@@ -198,7 +198,7 @@ deploy {
     hosts = "tusd"
     name  = "Deploy tusd"
     roles {
-      role                   = "{{{init.paths.roles_dir}}}/deploy/v1.4.0"
+      role                   = "{{{init.paths.roles_dir}}}/deploy/1.4.0"
       ansistrano_deploy_from = "./files/tusd_linux_amd64.tar.gz"
       ansistrano_deploy_to   = "{{{config.global.approot}}}"
       ansistrano_deploy_via  = "copy_unarchive"
@@ -217,8 +217,8 @@ deploy {
     hosts = "tusd"
     name  = "Deploy nginx"
     roles {
-      role         = "{{{init.paths.roles_dir}}}/apt/v1.0.0"
-      apt_packages = ["nginx-light"]
+      role        = "{{{init.paths.roles_dir}}}/apt/1.3.0"
+      apt_install = ["nginx-light"]
     }
     tasks {
       name = "nginx | Create nginx configuration"
diff --git a/.infra/group_vars/all/_frey.yml b/.infra/group_vars/all/_frey.yml
new file mode 100644
index 0000000..9eb5f20
--- /dev/null
+++ b/.infra/group_vars/all/_frey.yml
@@ -0,0 +1,6 @@
+# Frey specific overrides
+---
+# apt role
+apt_manage_sources_list: true
+apt_src_enable: false
+apt_install_state: present