Can't upload packages to LDS deployed with the new charm

[Andreas Hasenack]

When LDS is deployed with the new charm, there is some confusion regarding the /upload prefix and uploads don't work.

$ dput -fu lds:ubuntu/trusty/upload treq_0.1.0-1ubuntu3.14.04_amd64.changes
Uploading to lds (via https to 10.96.3.104):
  Uploading treq_0.1.0-1ubuntu3.14.04.dsc: Upload failed: 404 Not Found

server:
Jun 26 19:06:21 package-upload-1 INFO 10.96.3.104 - - [26/Jun/2015:19:06:20 +0000] "PUT /upload/standalone/ubuntu/trusty/upload/treq_0.1.0-1ubuntu3.14.04.dsc HTTP/1.1" 404 89 "-" "dput"

~/.dput.cf has:
[lds]
# this one was deployed with the new charm (FE is haproxy)
fqdn = 10.96.3.104
method = https
incoming = /upload/standalone/%(lds)s

This exact same dput configuration works when the same LDS is deployed with the charm store charm:
$ dput -fu otherlds:ubuntu/trusty/upload treq_0.1.0-1ubuntu3.14.04_amd64.changes
Uploading to otherlds (via https to 10.96.3.20):
  Uploading treq_0.1.0-1ubuntu3.14.04.dsc: done.
  Uploading treq_0.1.0-1ubuntu3.14.04.debian.tar.gz: done.
  Uploading python-treq_0.1.0-1ubuntu3.14.04_all.deb: done.
  Uploading treq_0.1.0-1ubuntu3.14.04_amd64.changes: done.
Successfully uploaded packages.

server:
Jun 26 19:07:47 package-upload-1 INFO 10.96.3.80 - - [26/Jun/2015:19:07:46 +0000] "PUT /standalone/ubuntu/trusty/upload/treq_0.1.0-1ubuntu3.14.04.dsc HTTP/1.1" 201 - "-" "dput"
Jun 26 19:07:47 package-upload-1 INFO 10.96.3.80 - - [26/Jun/2015:19:07:47 +0000] "PUT /standalone/ubuntu/trusty/upload/treq_0.1.0-1ubuntu3.14.04.debian.tar.gz HTTP/1.1" 201 - "-" "dput"
Jun 26 19:07:48 package-upload-1 INFO 10.96.3.80 - - [26/Jun/2015:19:07:48 +0000] "PUT /standalone/ubuntu/trusty/upload/python-treq_0.1.0-1ubuntu3.14.04_all.deb HTTP/1.1" 201 - "-" "dput"
Jun 26 19:07:49 package-upload-1 INFO 10.96.3.80 - - [26/Jun/2015:19:07:49 +0000] "PUT /standalone/ubuntu/trusty/upload/treq_0.1.0-1ubuntu3.14.04_amd64.changes HTTP/1.1" 201 - "-" "dput"

I was able to get the upload to work against the new charm after making these changes:
- accessing landscape-server/0 directly instead of going through haproxy
- removing the /upload prefix
- changing https to http