Merge remote-tracking branch 'origin/master' into micha
This commit is contained in:
commit
03ee590f14
|
@ -120,7 +120,22 @@ install {
|
|||
name = "Install tusd"
|
||||
roles {
|
||||
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"]
|
||||
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.1"
|
||||
|
@ -185,7 +200,6 @@ setup {
|
|||
}
|
||||
roles {
|
||||
role = "{{{init.paths.roles_dir}}}/fqdn/1.2.1"
|
||||
fqdn = "{{lookup('env', 'FREY_DOMAIN')}}"
|
||||
}
|
||||
tasks {
|
||||
file = "path=/mnt/tusd-data state=directory owner=www-data group=ubuntu mode=ug+rwX,o= recurse=yes"
|
||||
|
|
|
@ -8,7 +8,7 @@ apt_upgrade: false
|
|||
apt_dpkg_configure: true
|
||||
apt_install_state: present
|
||||
apt_clean: true
|
||||
apt_autoremove: true
|
||||
apt_autoremove: false
|
||||
|
||||
# ansistrano roles
|
||||
ansistrano_shared_paths:
|
||||
|
@ -29,3 +29,6 @@ hostname: "{{ fqdn.split('.')[0] }}"
|
|||
nodejs_yarn: false
|
||||
nodejs_npm_global_packages:
|
||||
- name: yarn
|
||||
|
||||
# unattended-upgrades
|
||||
unattended_remove_unused_dependencies: true
|
||||
|
|
|
@ -118,6 +118,9 @@ func TestConcat(t *testing.T) {
|
|||
Method: "POST",
|
||||
ReqHeader: map[string]string{
|
||||
"Tus-Resumable": "1.0.0",
|
||||
// A space between `final;` and the first URL should be allowed due to
|
||||
// compatibility reasons, even if the specification does not define
|
||||
// it. Therefore this character is included in this test case.
|
||||
"Upload-Concat": "final; http://tus.io/files/a /files/b/",
|
||||
},
|
||||
Code: http.StatusCreated,
|
||||
|
|
|
@ -341,8 +341,11 @@ func (handler *UnroutedHandler) HeadFile(w http.ResponseWriter, r *http.Request)
|
|||
if info.IsFinal {
|
||||
v := "final;"
|
||||
for _, uploadID := range info.PartialUploads {
|
||||
v += " " + handler.absFileURL(r, uploadID)
|
||||
v += handler.absFileURL(r, uploadID) + " "
|
||||
}
|
||||
// Remove trailing space
|
||||
v = v[:len(v)-1]
|
||||
|
||||
w.Header().Set("Upload-Concat", v)
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue