Hi, Here's a merge request for Loggerhead rebased on current http://bzr.debian.org/pkg-bazaar/loggerhead/unstable/ which completes the previous patch. The serve-branches.conf file used by the init script is now able to read a port. Since the other part of bug #511295 was already fixed, I took the liberty of including a closes: entry in the changelog.
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: lola...@debian.org-20090921163024-06xbo8r64fk3ofpj # target_branch: http://bzr.debian.org/pkg-bazaar/loggerhead/unstable/ # testament_sha1: 5423f1c96ac17e64287338f7cabe9ae48c293934 # timestamp: 2009-09-21 18:30:40 +0200 # base_revision_id: jel...@samba.org-20090910130819-tiovuy5aqp00eldg # # Begin patch === modified file 'debian/changelog' --- debian/changelog 2009-09-10 13:08:19 +0000 +++ debian/changelog 2009-09-21 16:30:24 +0000 @@ -2,6 +2,8 @@ [ Roland Mas ] * Use the YUI library provided by libjs-yui. (Closes: #511286) + * Switch init script to use serve-branches rather than + start-loggerhead (closes: #511295). [ Jelmer Vernooij ] * Use my debian.org address in Uploaders field. @@ -20,7 +22,7 @@ [ Jelmer Vernooij ] * Remove references to bzrlib installation from example config file. - -- Jelmer Vernooij <jel...@debian.org> Thu, 10 Sep 2009 15:06:01 +0200 + -- Roland Mas <lola...@debian.org> Mon, 21 Sep 2009 18:30:00 +0200 loggerhead (1.10-1) unstable; urgency=low === modified file 'debian/examples' --- debian/examples 2008-07-26 14:15:17 +0000 +++ debian/examples 2008-12-22 21:11:44 +0000 @@ -1,1 +1,1 @@ -loggerhead.conf.example +serve-branches.conf.example === modified file 'debian/loggerhead.init' --- debian/loggerhead.init 2009-09-10 13:08:19 +0000 +++ debian/loggerhead.init 2009-09-21 16:22:08 +0000 @@ -19,23 +19,25 @@ SCRIPTNAME=/etc/init.d/$NAME # Gracefully exit if the package has been removed. -[ -x /usr/bin/start-loggerhead ] || exit 0 +[ -x /usr/bin/serve-branches ] || exit 0 # Check if configuration file is present -[ ! -f /etc/loggerhead.conf ] && exit 0 +[ ! -f /etc/serve-branches.conf ] && exit 0 + +. /etc/serve-branches.conf # # Function that starts the daemon/service. # d_start() { - start-stop-daemon -p $PIDFILE -S --startas /usr/bin/start-loggerhead -- -p $PIDFILE -c /etc/loggerhead.conf -L /var/log/loggerhead 2>/dev/null + start-stop-daemon -p $PIDFILE -S --startas /usr/bin/serve-branches --chuid loggerhead --make-pidfile --background --chdir $served_branches -- --prefix=$prefix --port=$port --log-folder /var/log/loggerhead 2>/dev/null } # # Function that stops the daemon/service. # d_stop() { - start-stop-daemon -p $PIDFILE -K --startas /usr/bin/stop-loggerhead -- -p $PIDFILE + start-stop-daemon -p $PIDFILE -K } === added file 'debian/logrotate' --- debian/logrotate 1970-01-01 00:00:00 +0000 +++ debian/logrotate 2008-12-22 21:30:08 +0000 @@ -0,0 +1,8 @@ +/var/log/loggerhead/serve-branches.log { + daily + rotate 7 + size 10M + compress + delaycompress + missingok +} === modified file 'debian/postinst' --- debian/postinst 2008-08-06 19:53:37 +0000 +++ debian/postinst 2008-12-22 21:11:44 +0000 @@ -1,2 +1,5 @@ #!/bin/sh -e #DEBHELPER# + +adduser --system --group --home / loggerhead > /dev/null 2>&1 +chown loggerhead /var/log/loggerhead === added file 'serve-branches.conf.example' --- serve-branches.conf.example 1970-01-01 00:00:00 +0000 +++ serve-branches.conf.example 2009-09-21 16:22:08 +0000 @@ -0,0 +1,3 @@ +served_branches=/srv/bzr +prefix=/loggerhead +port=8080 # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdaGgOgACfTfgEAwfX///38u 3Aq////+YA4u9aVqvmzDQAaDQFJlTUFFSSQpZtAkEovDJE0hkNE9A0TAmmRjQCBhGATBNDjJk0Yh iaYCBgTTBGCYmmmgAwhxkyaMQxNMBAwJpgjBMTTTQAYQSFJqap+g0mk9MKNMjaQA0GmQAAMRkCKR ATJNoBG0RlPU9SntoFE/Ug9JtQANA9QKlEAQ00BMghNoKafqRpPETT0I0BkGg+QSGiQ0+/OZQUnv 8M7rgbFGI2LAIQfX4YabBsee0qRWEobB/E+ZCwO7mwFvH1fs6et+aYS19jFtAFBvGwIoUJCQWbZR V17SOlJZYlspqMQCUtlkQSMJE9qlKowVmDDKYnLLbQt5roi3876ALgWT58X7Cs6NcwhcdyutoO+R WFni525owpjO0ydIF6oA/IhBM23czLJfjWU5hZxMTGm0MabWTnEFliNKL3O5N9m87SpvSI1MsfLW Gx8BXy5lcqhgxzBQi2Ug7FWUkKYpoPRZrhNeq77QN0J0+MhDpGXvCsVSiIPSMiyLhLLnxPzVRiqn 7JaixJgy5oKXxBlGNjY2GZyfnKugQiBMk7uzz178e474KjTRjvr0B+KWpx3o2ZzawMjx2HM02X8N 7ud7byk460uHZr1F23h4K222W5K7s+Wr6ihVbbbTcnem8LBENqQEPGOtiRLNfDd2BASzpI14DofV KUVKHZS0BWDuSxEU8hS0pElFIHP0aNm3cVhlpMiUj7YtuzlrxpNtJ2i+Rm8IZmmZWYGSKTKKdopo H8Pe666VM8yHcvBCWpO8hUISFC5X4h1b+6rFuVRvaQpphnw97UEkkkkJJ9EZAaOs0gqHEZrq4sgG l6N3ZTWNJGsY2kMZt0EpTl7daUpzhi+CLUSPhFmWceb+eJimTwaWrLfw2wuWvbTq3L18NPg4rHxS hPk7r7J4+cGeKMyZ3osQLdY6Fy0T0RyjaohzYXpN0jFkufY5cuTBc84ZNrFjjq5Mmsf+p0gziSQu U2FWNSwLRH6MkrAgGVGqTULOVKfU1wqh5s+qH+2xkhYvkYd4kcp2Y1PPg5W5ZLdNddnW23Rduu2W do1cG1F0XureTROKzfckrbNUOM7q8JV54Ni4jVkxx2afNesnTmyaJVRb8r1dYtXL5Fbl+iTNyXLn 4VdGrRl7eJuiRpVvbW+pctdNt++DfhHPsxQLKSRdDBkktjwxQtz8VjNhEjBeS5ZEjbEjg8PSyZMl WWDe227Vqt6XNsqvwXb7KQq8netk1dngWsWa1isx1vuXtjRbepMWkwWEZHFVzXuDA0aKss3ukbON F1Zv4biVTWscsNzgxWNL2DlbLnBfsYNJe1aKKtMGKWsI5TByaKttjJYu11cWUm7VprTa0Pz2uDmu cGrEwyFRlhEi83DKLPpFlEYlmrG5S+++mCwVgijGmq2qiTNpIvywxvOFrlypSyxgtuQs3KG14bFX VjsYs6rLPyTiutaQoub2SSjwUVaNjm2r1zrapgzWLV7kyYJZqzsu2XrXC66cYprzVtVYcZGre4fz 3SxnIxTOGp6W2OzBpa3DRycCryo67nrBWYLGjZPWM1jU7NzsZzUUGP28cTEwCLJS2JPOFDDlPMwO /ONbSMET3ObWilCWZKLHhan67Cxg8nimPfFco7Kdlj3yVUm572FzhJPFm3Lzm4rmTicHo69MV6i5 5ws2wYpwX7lOOzl242763YY0mN9eKihgu1e7aS25ZyRZwNVGx1xWKOF+xm9clqxesN7N5XSHVYuc HFRYce7NVc4Lltjx9YNbYNOt+E2StY1rfb6pVIso7dFYWKEsue1kkSykddVyL1nmuL2zZgrwX4t7 ixYdIySvBaqLigvCZcVmQ2Ucj3HnchiWWXZctBTnwloicVpF0MGS1jA4lIxyysXr1FrS1DgtcW5a uK4EouWMqy9a4sobjY3L18qyVZLVpw8Ly0wMhsLuWCZIbIWSXwMlJC0qErRcoJTip8u+XPzE+O3Z yrSlQ4wr6pAud9GkgYRg08SG0SD0I1kKCgEJI4mmy8Gm02mMbI2JjCvsDROwjkBeBFiIURUk0oCE sTTm1hQlSVoclV7FzlDnYgBpJtpe+nOD6As6Sp0BXpD+h4rg7eZK46TnD4H/jSlVrBUTMxMzG8MT TCx3QECwqQm37qMYiAggiBLOnj4raeZOjqWi7CBZmHlWeRZSeSj2kZLX6V7Yu+TF9z7lVvE/Lyhx clpvcvutlKJ2GMvmVnsO8TETxBJeofrfwpXiIYJ7DwuSDKE5xBZHWM9sfy5pDOH9IpKdC+G+RbGW zu5dXhv/G82PJ1Vdma12b3M+D3MmCqj4/HFavfF+LisUfF4SXOc1LVi9gq0ZP3KtXv4s0g/I3Lja +CcY/TNRiUK+cMvVEq5Po5uju5rXRvVd1HdRcwfRhCx8vfidptIPpsLT92BoNOKX+O7tiW4ikE7p t+YsSH/da3+35ws8WB7TrmZvKmkoKJYvlHl5XI8lVrhdZ9jwXvFgxd5Fq9imDZJMXi81zNe2yGEe 5xe5vawMTvH7Y72GL2Vf2dOnJ6Sf2kkmYycTq2cgsLjB9hqT1F9H8UDaqvHsvNxYHXPeshfl+r1t Xfsh9CqpLT+EuhxPZ8mft7udmis5HzIKyZzLTv9qTaZDffmnKXZVOKPLqZjcX39TOYGYc5nMNabl 4MEG8QoDOJ1bIQxiAihCgjc5uiRteh3SDzMnv/XHa55OrYxPFeuVbnB4uy16ezWLVVZKSNGl8ffJ zOvGHkTtyIaFYRbT8/PhN3RwuS1b0Sq8FgErA4hwZKTjoJlLFa0PkXhQCnR50R6j2KvHKPXjTzj6 lZPi9GihR6Pse9p8/V8Wroj5t75qL/o3t6c1G5cwSVb3eSceM/zh98OyNJMo1bWhHgh2jaMSE2Je P2MtMqpSDgkiAAIWURrlP2QL6agj5Csw5olaJuCcg8nD+SUvhCwkBahqU6jRpBdVU00wyDOiapTB Lo5IQ8e1Bp42eAoHCWpNYez7oBW2Ed0m3IHe1HFtOxGnO2fOF8/H4RfFyXwphIgQITQ5XQnmCmv1 Jg+GYwClOiGhfyyieWwfA4mZA8zwOsB8ED06d688w88xpaXkI2mjgXwZot8JHH6WxBypKRZ9SUUg tHqBoKLJwhjaLUtjW2vIiMncCJ6lE05I/wiESYaw5CFAdFSFAdCkKIZQZFHTXtxE1nVKE9VMdeHb neimxe0okIbMi4Jgs0Zw/H1jKLEZRzSUSx5ytTBRPlRYkAhJh8ek1AxEJUoOZgagSFVpVlJI0JNJ AyR9qVJITb0GIRcAkAc/mah+Sq1Hv4/w7rg9hjcKHtMT6jNVcrHvzXeGdIj6QAnqlAlCX6UgFtJA niKBJTySat0mlO6AyJf6BnDu2Vp5p2J3iYp8U5qFAvpoQsBcqGcS7K0jzsH65afv1emEaK2pqxXx wSUhzmj6kfa8Xf6Ruh9IPTJ0PCt9bOxZFV9/3Jj5QuJiR9YTtuM/A/ZHeSxIEGtNqVobEhWaZBQL hSzIzU0ztBfLoBSXjBDYJKBD7a5Ak1ZEqEhICF4HIkjvIW8SEioT6Lg7LQ3JL4agpINewkwcWeFq HESwXYLlvBTXND9hgodmYM2cGziyS37Q15XXgyTMiVoa59LjRfJnulpgCCZOP7/KPlGDJF7KH3of vOpsSXThH5Q4N8zjKMO0dENI1YGH4RLqFdm1FqMpa5RYmg4K9IUqhQtTxWaECQhZlGpD9OdV3tMj GPnpOEim7+6HfXb7zEujHb1Ptg9oPr3TKOsMCOEkxJFN8NY6dZ0fnB+d23k49DSd6GieKUK+5Vj4 1ki9Pjw7c45QpFEd6eaEkJpr5eIfA1hlxDYZcl+TiOpTdambdx/zG3+LuSKcKEhrQ0B0AA==
Roland. -- Roland Mas The best definition of an immortal is someone who hasn't died yet. -- in Ye Gods! (Tom Holt)
