Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ocaml/xapi/xapi_host.ml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ let pool_size_is_restricted ~__context =
not (Pool_features.is_enabled ~__context Features.Pool_size)

let bugreport_upload ~__context ~host:_ ~url ~options =
if url = "" then
raise Api_errors.(Server_error (invalid_value, ["url"; ""])) ;
let proxy =
if List.mem_assoc "http_proxy" options then
List.assoc "http_proxy" options
Expand Down
3 changes: 2 additions & 1 deletion ocaml/xapi/xapi_host_crashdump.ml
Original file line number Diff line number Diff line change
Expand Up @@ -149,5 +149,6 @@ let destroy ~__context ~self =

let upload ~__context ~self ~url ~options =
let filename = Db.Host_crashdump.get_filename ~__context ~self in
let url = if url = "" then upload_url filename else url in
if url = "" then
raise Api_errors.(Server_error (invalid_value, ["url"; ""])) ;
do_upload "host-crash-upload" (crash_dir ^ "/" ^ filename) url options
8 changes: 0 additions & 8 deletions ocaml/xapi/xapi_support.ml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
module D = Debug.Make (struct let name = "xapi_support" end)

open D

let support_url = "ftp://support.xensource.com/uploads/"

(* URL to which the crashdump/whatever will be uploaded *)
let upload_url name =
let uuid = Xapi_inventory.lookup Xapi_inventory._installation_uuid in
Printf.sprintf "%s%s-%s" support_url uuid name

open Forkhelpers

let do_upload label file url options =
Expand Down
4 changes: 1 addition & 3 deletions scripts/host-bugreport-upload
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# Upload a bugreport to the support website

DEFAULT_BASE_URL="ftp://support.xensource.com/uploads/"

# If the user supplies a bare filename without a URI scheme,
# we ignore it -- if they _really_ want to upload named files
# to our support server, they can specify the URI scheme.
Expand All @@ -19,7 +17,7 @@ if [ -z "$FILENAME" ]; then
. @INVENTORY@
FILENAME=${INSTALLATION_UUID}-${now}
fi
[ ! -z "${BASE_URL}" ] || BASE_URL="${DEFAULT_BASE_URL}"
[ -n "${BASE_URL}" ] || exit 1

URL="${BASE_URL}${FILENAME}"

Expand Down
57 changes: 0 additions & 57 deletions scripts/runtests

This file was deleted.

Loading