views: Use request scheme in sample pwclientrc file.

Adapt the pwclientrc file to suit the current scheme in use.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/apps/patchwork/views/base.py b/apps/patchwork/views/base.py
index 338c67395b4bc3600d875fe6cd00aee5ea0bf962..bb78fa47b52f54a5699ba446842b7e15b2a4fce7 100644 (file)
--- a/apps/patchwork/views/base.py
+++ b/apps/patchwork/views/base.py
@@ -47,6 +47,10 @@ def pwclientrc(request, project_id):
     project = get_object_or_404(Project, linkname = project_id)
     context = PatchworkRequestContext(request)
     context.project = project
+    if request.is_secure():
+        context['scheme'] = 'https'
+    else:
+        context['scheme'] = 'http'
     response = HttpResponse(mimetype = "text/plain")
     response['Content-Disposition'] = 'attachment; filename=.pwclientrc'
     response.write(render_to_string('patchwork/pwclientrc', context))

diff --git a/templates/patchwork/pwclientrc b/templates/patchwork/pwclientrc
index 5fb1f47b65e3ba0696dfa375f94c731137c24667..c932b1173e862bf7d5d9984e146d31aa653ff9fe 100644 (file)
--- a/templates/patchwork/pwclientrc
+++ b/templates/patchwork/pwclientrc
@@ -4,7 +4,7 @@
 # Save this file to ~/.pwclientrc
 #
 [base]
-url: http://{{site.domain}}{% url patchwork.views.xmlrpc.xmlrpc %}
+url: {{scheme}}://{{site.domain}}{% url patchwork.views.xmlrpc.xmlrpc %}
 project: {{ project.linkname }}
 {% if user.is_authenticated %}
 # Adding authentication parameters will allow you to use the 'update'