Merge branch 'master' of github.com:tus/tusd

.infra/Freyfile.hcl

@@ -110,11 +110,11 @@ install {
     hosts = "tusd"
     name  = "Install tusd"
     roles {
-      role        = "{{{init.paths.roles_dir}}}/apt/1.3.0"
+      role        = "{{{init.paths.roles_dir}}}/apt/1.4.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/1.3.0"
+      role = "{{{init.paths.roles_dir}}}/unattended-upgrades/1.3.1"
     }
     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"
@@ -156,7 +156,7 @@ setup {
       upstart_user          = "www-data"
     }
     roles {
-      role = "{{{init.paths.roles_dir}}}/rsyslog/3.1.0"
+      role = "{{{init.paths.roles_dir}}}/rsyslog/3.1.1"
       rsyslog_rsyslog_d_files "49-tusd" {
         directives = ["& stop"]
         rules {
@@ -166,7 +166,7 @@ setup {
       }
     }
     roles {
-      role = "{{{init.paths.roles_dir}}}/fqdn/1.0.0"
+      role = "{{{init.paths.roles_dir}}}/fqdn/1.2.1"
       fqdn = "{{lookup('env', 'FREY_DOMAIN')}}"
     }
     tasks {
@@ -202,7 +202,7 @@ deploy {
     hosts = "tusd"
     name  = "Deploy tusd"
     roles {
-      role                   = "{{{init.paths.roles_dir}}}/deploy/1.4.0"
+      role                   = "{{{init.paths.roles_dir}}}/deploy/2.0.0"
       ansistrano_deploy_from = "./files/tusd_linux_amd64.tar.gz"
       ansistrano_deploy_to   = "{{{config.global.approot}}}"
       ansistrano_deploy_via  = "copy_unarchive"
@@ -221,7 +221,7 @@ deploy {
     hosts = "tusd"
     name  = "Deploy nginx"
     roles {
-      role        = "{{{init.paths.roles_dir}}}/apt/1.3.0"
+      role        = "{{{init.paths.roles_dir}}}/apt/1.4.0"
       apt_install = ["nginx-light"]
     }
     tasks {

.infra/group_vars/all/_frey.yml

@@ -24,3 +24,8 @@ ansistrano_remove_rolled_back: no
 # fqdn
 fqdn: "{{ lookup('env', 'FREY_DOMAIN') }}"
 hostname: "{{ fqdn.split('.')[0] }}"
+
+# nodejs
+nodejs_yarn: false
+nodejs_npm_global_packages:
+  - name: yarn

.infra/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "This folder is charge of launching master.tus.io via [Frey](https://github.com/kvz/frey).  You could re-use bits of this, but you could also run tusd any other way you want.  It's not a requirement for running a tusd server.",
   "dependencies": {
-    "frey": "0.3.27"
+    "frey": "0.3.28"
   },
   "devDependencies": {},
   "scripts": {

.infra/yarn.lock

@@ -328,9 +328,9 @@ flat@2.0.0:
   dependencies:
     is-buffer "~1.1.2"
 
-frey@0.3.27:
+frey@0.3.28:
-  version "0.3.27"
+  version "0.3.28"
-  resolved "https://registry.yarnpkg.com/frey/-/frey-0.3.27.tgz#2e29b8b321b3178b95d6a36d0cfc1e91a588c174"
+  resolved "https://registry.yarnpkg.com/frey/-/frey-0.3.28.tgz#d18c641d82faee834c18a7925388497e494d6888"
   dependencies:
     async "1.5.2"
     babel-polyfill "6.13.0"

appveyor.yml

@@ -8,10 +8,12 @@ install:
   - git submodule update --init --recursive
 
 build_script:
+  - set PATH=%GOPATH%\bin;%PATH%
   - go env
   - go version
   - go get ./s3store
   - go get ./consullocker
+  - go get github.com/hashicorp/consul
 
 test_script:
   - go test .