Metaswitch/sprout — pull request #85 by mirw (2013-06-21 13:39:01+00:00)
Title: [Reviewer: Mike] Allow bono and sprout to have different trusted ports

Mike, please can you review my fix to allow bono and sprout to be run on different trusted ports (allowing them both to run on the same host)?

* The C changes are pretty self-explanatory.
* The Debian package changes are just to remove the "conflict" tags and rename the bono binary so that the 2 packages can be installed side-by-side.

As of this change, bono and sprout won't both start when installed side-by-side, because they're still both configured to run on port 5058. Before I make that change, I'll need to update the manual install docs and the chef process, but I think it makes sense to get the rest of these changes merged into dev.

I've run the UT and the automated live tests and tested this live, both in vanilla configuration and after applying a config hack to make sprout's trusted port be 5057 (which worked).