From 198c72c479b16c6876ce713ac1bcbc61bff43029 Mon Sep 17 00:00:00 2001 From: Marius Date: Fri, 27 Jan 2017 14:22:53 +0100 Subject: [PATCH 1/5] Install consul(1) before running tests on AppVeyor --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 77d1c42..55bce95 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,6 +12,7 @@ build_script: - go version - go get ./s3store - go get ./consullocker + - go get github.com/hashicorp/consul test_script: - go test . From 029191c8634c13989c81f0d8aa88d54dc4f997aa Mon Sep 17 00:00:00 2001 From: Marius Date: Fri, 27 Jan 2017 14:27:02 +0100 Subject: [PATCH 2/5] Include Golang binaries in PATH --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 55bce95..5dcb125 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,6 +8,7 @@ install: - git submodule update --init --recursive build_script: + - set PATH=%GOPATH%\bin;%PATH% - go env - go version - go get ./s3store From 3052090f72212e213bd3a0547f10f680b780ccc9 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Tue, 31 Jan 2017 13:37:18 +0100 Subject: [PATCH 3/5] Update roles (#101) --- .infra/Freyfile.hcl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.infra/Freyfile.hcl b/.infra/Freyfile.hcl index eb6889e..e71eba9 100644 --- a/.infra/Freyfile.hcl +++ b/.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 { From 98009f87c12965889f93fbc6a587a91cd577c3a4 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Tue, 31 Jan 2017 13:37:43 +0100 Subject: [PATCH 4/5] Update Frey variables (#100) Needed for future role updates and cleanup --- .infra/group_vars/all/_frey.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.infra/group_vars/all/_frey.yml b/.infra/group_vars/all/_frey.yml index 4553cfd..fb94b97 100644 --- a/.infra/group_vars/all/_frey.yml +++ b/.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 From 8784d54045fab90388020bbd3037d2e87e0cdace Mon Sep 17 00:00:00 2001 From: Kevin van Zonneveld Date: Tue, 31 Jan 2017 14:44:03 +0100 Subject: [PATCH 5/5] Upgrade Frey to v0.3.28 /cc @tersmitten (#102) --- .infra/package.json | 2 +- .infra/yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.infra/package.json b/.infra/package.json index b28a90f..8c0d75f 100644 --- a/.infra/package.json +++ b/.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": { diff --git a/.infra/yarn.lock b/.infra/yarn.lock index 88ffed2..5fe0837 100644 --- a/.infra/yarn.lock +++ b/.infra/yarn.lock @@ -328,9 +328,9 @@ flat@2.0.0: dependencies: is-buffer "~1.1.2" -frey@0.3.27: - version "0.3.27" - resolved "https://registry.yarnpkg.com/frey/-/frey-0.3.27.tgz#2e29b8b321b3178b95d6a36d0cfc1e91a588c174" +frey@0.3.28: + version "0.3.28" + resolved "https://registry.yarnpkg.com/frey/-/frey-0.3.28.tgz#d18c641d82faee834c18a7925388497e494d6888" dependencies: async "1.5.2" babel-polyfill "6.13.0"