Merge remote-tracking branch 'chrislea/master'

Conflicts:
	repoman/common.py

README.mkd

@@ -194,3 +194,22 @@ The last component of the URL is the build ID returned by the initial build POST
 
 Returns the tarball binary if the build is done or an informative message otherwise. Completed builds may only be available for up to 24 hours. After which, the build directories are cleaned and removed.
 
+### Caveats
+
+If you're going to run repomand under something like supervisor, be *sure* to set daemonize to false in `web.conf`.
+
+Be sure the user repomand runs as has permissions to write to the specified logging directory.
+
+Be sure to set the `REPOMAN_API_URL` environment variable. This will typically be set to `http://localhost:9998`. If you build a Debian package using the included things in the debian/ directory, this will be done for you.
+
+An example config file for supervisor might look like this:
+
+    [program:repoman]
+    command=/usr/bin/repomand
+    autostart=true
+    autorestart=true
+    redirect_stderr=true
+    stdout_logfile=/var/log/repoman/repoman-stdout.log
+    user=jenkins
+    exitcodes=0
+

conf/web.conf

@@ -19,7 +19,7 @@
 		"bind_address": "0.0.0.0",
 		"bind_port": 9998,
 		"daemonize": true,
-		"daemon_log": "repoman.log",
-        "static_path": "/usr/share/repoman/html"
+		"daemon_log": "/tmp/repoman.log",
+		"static_path": "/usr/share/repoman/html"
 	}
 }

debian/changelog

@@ -1,3 +1,10 @@
+repoman (1.5.1sg7) unstable; urgency=low
+
+  * Fix issue where binary-only packages wouldn't upload because they had
+    no .dsc file referenced.
+
+ -- Ian Eure <ian@simplegeo.com>  Thu, 10 Jun 2010 13:02:09 -0700
+
 repoman (1.5.1sg6) unstable; urgency=low
 
   * Parse .dsc file referenced in .changes file when packing, otherwise

debian/control

@@ -3,7 +3,7 @@ Section: python
 Priority: extra
 Maintainer: Jeremy Grosser <synack@digg.com>
 Build-Depends: cdbs, debhelper (>= 7)
-Build-Depends-Indep: python-dev, python-support (>= 0.2.3)
+Build-Depends-Indep: python-dev, python-support (>= 0.2.3), python-setuptools
 Standards-Version: 3.8.4
 XS-Python-Version: all
 

debian/repoman.sh

@@ -0,0 +1,2 @@
+REPOMAN_API_URL="http://localhost:9998"
+export REPOMAN_API_URL

debian/rules

@@ -13,5 +13,8 @@ binary-post-install/python-repoman::
 	install -d -m 0755 $(CURDIR)/debian/python-repoman/usr/share/repoman/
 	cp -r $(CURDIR)/html $(CURDIR)/debian/python-repoman/usr/share/repoman/
 
+	install -d -m 0755 $(CURDIR)/debian/python-repoman/etc/profile.d/
+	install -m 0644 $(CURDIR)/debian/repoman.sh $(CURDIR)/debian/python-repoman/etc/profile.d/
+
 clean::
 	-rm -rf build

repoman/common.py

@@ -7,6 +7,7 @@
 import wsgiref.simple_server as wsgi_server
 from repoman.config import conf
 import os.path
+from webob import Response
 
 class RequestHandler(object):
     def __init__(self, app, request):