Merge lp:~patrick-hetu/charms/precise/ppabuilder/trunk into lp:~gandelman-a/charms/precise/ppabuilder/trunk

[Patrick Hetu]

I added inoticoming to detect incoming source package and build them with rebuildd plus other minor fixes. Don't be afraid to ask me if you want more details.

Note that the charm will not work until this bug is fixed:

  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=671635

=== modified file 'hooks/install'
--- hooks/install	2012-01-02 08:44:09 +0000
+++ hooks/install	2012-06-21 04:49:20 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-PACKAGES="dpkg-dev devscripts rebuildd reprepro apache2"
+PACKAGES="dpkg-dev devscripts rebuildd reprepro apache2 inoticoming pbuilder"
 # added for testing 
 PACKAGES="$PACKAGES cdbs quilt dpatch"
 BASE_DIR=$(config-get repo-directory)
@@ -48,7 +48,7 @@
 DebIndices: Packages Release . .gz .bz2
 DscIndices: Sources Release .gz .bz2
 Tracking: all includechanges keepsources
-Log: logfile
+Log: logs/reprepro.log
   --changes $BASE_DIR/bin/build_sources
 
 END
@@ -89,6 +89,7 @@
 mkdir -p $BASE_DIR/incoming
 mkdir -p $BASE_DIR/incomingtmp
 mkdir -p $BASE_DIR/bin
+mkdir -p $BASE_DIR/logs
 chmod -R 755 $BASE_DIR
 
 create_distros
@@ -102,7 +103,7 @@
 IncomingDir: incoming
 Allow: $(config-get supported-releases) 
 Cleanup: on_deny on_error
-Tempdir: incomingt
+Tempdir: incomingtmp
 END
 
 [[ -e /etc/apache2/sites-enabled/000-default ]] &&
@@ -144,7 +145,7 @@
 # not sure why this fails.
 rebuildd init || true
 
-/etc/init.d/rebuildd start
+service rebuildd start
 
 # we need to setup access to the local sources. rebuildd will fetch
 # from there to build.
@@ -175,5 +176,19 @@
 # install scripts needed by both reprepro + rebuildd
 cp hooks/scripts/* $BASE_DIR/bin/
 
+cat >/etc/init/inoticoming.conf <<END
+description "inoticoming Daemon"
+
+start on filesystem
+stop on runlevel [016]
+
+script
+    cd $BASE_DIR
+    inoticoming --foreground --logfile logs/inoticoming.log --pid-file inoticoming.pid incoming --suffix .changes --stderr-to-log $BASE_DIR/bin/inoticoming.sh {} \;
+end script
+END
+
+service inoticoming start
+
 open-port 80
 open-port 9998

=== added file 'hooks/scripts/inoticoming.sh'
--- hooks/scripts/inoticoming.sh	1970-01-01 00:00:00 +0000
+++ hooks/scripts/inoticoming.sh	2012-06-21 04:49:20 +0000
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sleep 30 # 30 seconds to be sure that all files arrived
+reprepro --silent --basedir /srv/reprepro/ --waitforlock 1000 processincoming incoming $1

=== modified file 'revision'
--- revision	2012-01-02 08:44:09 +0000
+++ revision	2012-06-21 04:49:20 +0000
@@ -1,1 +1,1 @@
-6
+7