[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r84: Do things (build the master, run the master, etc.) as the buildbot user.

[Jeff Licquia]

------------------------------------------------------------
revno: 84
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Sat 2012-01-28 08:56:23 -0500
message:
  Do things (build the master, run the master, etc.) as the buildbot user.
added:
  modules/user/manifests/buildbot.pp
modified:
  modules/buildbot/files/buildbot.init
  modules/buildbot/manifests/init.pp
  modules/buildbot/manifests/master.pp
  modules/user/manifests/virtual.pp
-------------- next part --------------
=== modified file 'modules/buildbot/files/buildbot.init'
--- a/modules/buildbot/files/buildbot.init	2012-01-28 05:54:20 +0000
+++ b/modules/buildbot/files/buildbot.init	2012-01-28 13:56:23 +0000
@@ -13,13 +13,14 @@
 
 PRG=buildbot
 DAEMON=/opt/buildbot/bin/$PRG
+USER=buildbot
 
 test -x $DAEMON || exit 0
 
 case "$1" in
   start)
     echo -n "Checking configuration for $PRG: "
-    $DAEMON checkconfig /opt/buildbot/lsb-master >> /tmp/buildbot-start.log 2>&1
+    /bin/su -c "$DAEMON checkconfig /opt/buildbot/lsb-master >> /tmp/buildbot-start.log 2>&1" $USER
     if [ $? -eq 0 ]; then
         echo "done"
     else
@@ -27,13 +28,13 @@
         exit 1
     fi
     echo -n "Starting $PRG: "
-    $DAEMON start /opt/buildbot/lsb-master 2>>/tmp/buildbot-start.log >/dev/null
+    /bin/su -c "$DAEMON start /opt/buildbot/lsb-master 2>>/tmp/buildbot-start.log >/dev/null" $USER
     RETVAL=$?
     echo "done"
     ;;
   stop)
     echo -n "Stopping $PRG: "
-    $DAEMON stop /opt/buildbot/lsb-master >> /tmp/buildbot-start.log 2>&1
+    /bin/su -c "$DAEMON stop /opt/buildbot/lsb-master >> /tmp/buildbot-start.log 2>&1" $USER
     RETVAL=$?
     echo "done"
     ;;

=== modified file 'modules/buildbot/manifests/init.pp'
--- a/modules/buildbot/manifests/init.pp	2012-01-28 01:16:19 +0000
+++ b/modules/buildbot/manifests/init.pp	2012-01-28 13:56:23 +0000
@@ -2,6 +2,8 @@
 
     include python::virtualenv
 
+    include user::buildbot
+
     $buildbotversion = '0.8.5'
 
     # XXX: make needs to be its own module

=== modified file 'modules/buildbot/manifests/master.pp'
--- a/modules/buildbot/manifests/master.pp	2012-01-28 05:57:48 +0000
+++ b/modules/buildbot/manifests/master.pp	2012-01-28 13:56:23 +0000
@@ -21,6 +21,7 @@
         cwd     => "/opt/buildbot",
         creates => "/opt/buildbot/lsb-master",
         path    => [ "/bin", "/sbin", "/usr/bin", "/usr/sbin" ],
+        user    => 'buildbot',
         require => Exec["make-buildbot"],
     }
 
@@ -57,6 +58,7 @@
         ensure     => running,
         hasrestart => false,
         hasstatus  => false,
+        require    => User['buildbot'],
     }
 
 }

=== added file 'modules/user/manifests/buildbot.pp'
--- a/modules/user/manifests/buildbot.pp	1970-01-01 00:00:00 +0000
+++ b/modules/user/manifests/buildbot.pp	2012-01-28 13:56:23 +0000
@@ -0,0 +1,5 @@
+class user::buildbot inherits user::virtual {
+
+    realize( User['buildbot'] )
+
+}

=== modified file 'modules/user/manifests/virtual.pp'
--- a/modules/user/manifests/virtual.pp	2012-01-27 16:58:15 +0000
+++ b/modules/user/manifests/virtual.pp	2012-01-28 13:56:23 +0000
@@ -2,6 +2,10 @@
 # individual user classes.
 class user::virtual inherits user {
 
+    @user { 'buildbot':
+        ensure      => present,
+    }
+
     @user { 'lfadmin':
         ensure      => present,
         uid         => '1000',