Merge lp:~xnox/charms/precise/sbuild/add-more-options into lp:charms/sbuild

[Dimitri John Ledkov]

  * make btsparty an option (to have unattended sbuilds)
  * add $HOME option (set to /mnt, as that's where most clouds give space)
  * add .mk-sbuild.rc & .mk-sbuild.sources (for mk-sbuild integration)

[Juan L. Negron (negronjl)]

Hi Dmitrijs:

Thank you for the extra options in the charm.

This looks good to me and, it doesn't seem to be breaking anything.

Approved.

Merged.

Thanks,

Juan

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2012-06-18 16:15:49 +0000
+++ config.yaml	2012-11-20 10:18:32 +0000
@@ -3,11 +3,19 @@
         type: string
         default: builder
         description: The name of the account that performs builds.
+    home:
+        type: string
+        default: /home
+        description: The home directory location for the above account.
     salt:
         type: string
         default: unset
         description: Salt for generating builder accounts.
         validator: '.{8,}'
+    btsparty:
+        type: boolean
+        default: yes
+        description: Setup accounts for public access.
     chroots:
         type: string
         default: ubuntu:quantal
@@ -16,3 +24,11 @@
         type: string
         default: ""
         description: Comma-separated list of extra packages to install in chroots.
+    mk-sbuild.rc:
+        type: string
+        default: ""
+        description: Contents of mk-sbuild.rc. See $ man mk-sbuild.
+    mk-sbuild.sources:
+        type: string
+        default: ""
+        descption: Conternts of ~/.mk-sbuild.sources. See $ man mk-sbuild.
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-06-18 16:15:49 +0000
+++ hooks/config-changed	2012-11-20 10:18:32 +0000
@@ -3,16 +3,30 @@
 
 USERNAME=$(config-get username)
 SALT=$(config-get salt)
+BTSPARTY=$(config-get btsparty)
 
-password=$(echo "$SALT:$JUJU_UNIT_NAME" | md5sum - | cut -c-12)
-juju-log "On $JUJU_UNIT_NAME $USERNAME password is '$password'"
-echo "$USERNAME:$password" | chpasswd
+if [ "$BTSPARTY" = "yes" ]; then
+    password=$(echo "$SALT:$JUJU_UNIT_NAME" | md5sum - | cut -c-12)
+    juju-log "On $JUJU_UNIT_NAME $USERNAME password is '$password'"
+    echo "$USERNAME:$password" | chpasswd
+fi
 
 CHROOTS=$(config-get chroots)
 PACKAGES=$(config-get packages)
+MK_SBUILD_RC=$(config-get mk-sbuild.rc)
+MK_SBUILD_SOURCES=$(config-get mk-sbuild.sources)
+HOMEDIR=$(getent passwd $USERNAME | cut -d: -f 6)
 if [ -n "$PACKAGES" ]; then
     PACKAGES="--debootstrap-include=$PACKAGES"
 fi
+if [ -n "$MK_SBUILD_RC" ]; then
+    config-get mk-sbuild.rc -o $HOMEDIR/.mk-sbuild.rc
+    chown $USERNAME $HOMEDIR/.mk-sbuild.rc
+fi
+if [ -n "$MK_SBUILD_SOURCES" ]; then
+    config-get mk-sbuild.rc -o $HOMEDIR/.mk-sbuild.sources
+    chown $USERNAME $HOMEDIR/.mk-sbuild.sources
+fi
 
 ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
 arches=$ARCH
 
=== modified file 'hooks/install'
--- hooks/install	2012-06-18 23:28:51 +0000
+++ hooks/install	2012-11-20 10:18:32 +0000
@@ -2,9 +2,11 @@
 set -ex
 
 USERNAME=$(config-get username)
+HOMEDIR=$(config-get home)
 DISTRO=$(config-get distro)
 RELEASES=$(config-get releases)
 SALT=$(config-get salt)
+BTSPARTY=$(config-get btsparty)
 
 echo set debconf/frontend Noninteractive | debconf-communicate
 echo set debconf/priority critical | debconf-communicate
@@ -13,24 +15,16 @@
 
 apt-get dist-upgrade -y
 
-apt-get install -y build-essential devscripts ubuntu-dev-tools sbuild schroot debootstrap rng-tools </dev/null
+apt-get install -y build-essential devscripts ubuntu-dev-tools sbuild schroot debootstrap haveged </dev/null
 
 # Fix up weird issue with debootstrap leaving system in uninstallable state
 perl -pi -e 's/^# Pull down signature requirements/apt-get -f install -y --force-yes\n# Pull down signature requirements/' /usr/bin/mk-sbuild
 
-passwd -l ubuntu
-if grep -q '^PasswordAuthentication no' /etc/ssh/sshd_config; then
-    perl -pi -e 's/^PasswordAuthentication no/PasswordAuthentication yes/' /etc/ssh/sshd_config
-    service ssh restart
-fi
 if ! getent passwd $USERNAME >/dev/null; then
     adduser --quiet --disabled-password --ingroup users \
             --gecos "Build User" \
-            --home /home/$USERNAME $USERNAME
+            --home $HOMEDIR/$USERNAME $USERNAME
 fi
-password=$(echo "$SALT:$JUJU_UNIT_NAME" | md5sum - | cut -c-12)
-juju-log "On $JUJU_UNIT_NAME $USERNAME password is '$password'"
-echo "$USERNAME:$password" | chpasswd
 
 cat >/etc/sudoers.d/60-sbuild <<EOM
 $USERNAME ALL=(ALL) NOPASSWD:ALL
@@ -41,13 +35,20 @@
 if ! getent group sbuild | grep -q $USERNAME; then
     # No-op to set up mk-sbuild environment.
     EDITOR=cat su -c "/usr/bin/mk-sbuild invalid-release" $USERNAME
-    # Terrible hack to gain entropy and generate builder keys for sbuild.
-    rngd -r /dev/urandom
     su -c "sbuild-update --keygen" $USERNAME
 fi
 
-rm -f /etc/update-motd.d/98-cloudguest
-cat >/etc/update-motd.d/98-sbuild <<EOM
+if [ "$BTSPARTY" = "yes" ]; then
+    passwd -l ubuntu
+    if grep -q '^PasswordAuthentication no' /etc/ssh/sshd_config; then
+	perl -pi -e 's/^PasswordAuthentication no/PasswordAuthentication yes/' /etc/ssh/sshd_config
+	service ssh restart
+    fi
+    password=$(echo "$SALT:$JUJU_UNIT_NAME" | md5sum - | cut -c-12)
+    juju-log "On $JUJU_UNIT_NAME $USERNAME password is '$password'"
+    echo "$USERNAME:$password" | chpasswd
+    rm -f /etc/update-motd.d/98-cloudguest
+    cat >/etc/update-motd.d/98-sbuild <<EOM
 #!/bin/bash
 echo ""
 echo "###################################################################"
@@ -58,6 +59,7 @@
 echo "#                                                                 #"
 echo "###################################################################"
 EOM
-chmod a+rx /etc/update-motd.d/98-sbuild
+    chmod a+rx /etc/update-motd.d/98-sbuild
+fi
 
 exit 0
 
=== modified file 'revision'
--- revision	2012-06-18 16:15:49 +0000
+++ revision	2012-11-20 10:18:32 +0000
@@ -1,1 +1,1 @@
-22
+24