From 80bbf87bb7b30cae795ab01a2a926b79f008d4fc Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 9 Apr 2014 20:56:36 +0000
Subject: [PATCH] Finish puppeting accessbot

Change-Id: I329545d815cbacf717aa86a4d140290419be9810
---
 manifests/init.pp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 93a959a..800b8f4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -20,9 +20,18 @@ class accessbot(
     ensure => present,
   }
 
+  # A lot of things need yaml, be conservative requiring this package to avoid
+  # conflicts with other modules.
+  if ! defined(Package['python-yaml']) {
+    package { 'python-yaml':
+      ensure => present,
+    }
+  }
+
   exec { 'run_accessbot' :
     command     => '/usr/local/bin/accessbot -c /etc/accessbot/accessbot.config -l /etc/accessbot/channels.yaml >> /var/log/accessbot/accessbot.log 2>&1',
     path        => '/usr/local/bin:/usr/bin:/bin/',
+    user        => 'accessbot',
     refreshonly => true,
     subscribe   => File['/etc/accessbot/channels.yaml'],
     require     => [File['/etc/accessbot/channels.yaml'],
@@ -65,10 +74,9 @@ class accessbot(
   file { '/usr/local/bin/accessbot':
     ensure  => present,
     source  => 'puppet:///modules/accessbot/accessbot.py',
-    group   => 'accessbot',
-    mode    => '0440',
+    mode    => '0555',
     owner   => 'root',
+    group   => 'root',
     replace => true,
-    require => User['accessbot'],
   }
 }