coren has submitted this change and it was merged.
Change subject: Tool Labs: tweaks to bigbrother
......................................................................
Tool Labs: tweaks to bigbrother
- remove some testing code
- linting
- make service resource and ensure => running
Change-Id: I1374a2acd17f9fdc3723049b0e1cb6a6e55abb9e
---
M modules/toollabs/files/bigbrother
M modules/toollabs/manifests/submit.pp
2 files changed, 9 insertions(+), 5 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/files/bigbrother
b/modules/toollabs/files/bigbrother
index f1dcd1d..71d27fb 100755
--- a/modules/toollabs/files/bigbrother
+++ b/modules/toollabs/files/bigbrother
@@ -1,11 +1,11 @@
#!/usr/bin/perl -w
#
# Copyright © 2014 Marc-André Pelletier <mpellet...@wikimedia.org>
-#
+#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
-#
+#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
@@ -79,7 +79,7 @@
my $expect;
my $start;
if(m/^webservice(:?\s+-([a-z]+))?$/) {
- my $name = $1 // "lighttpd";
+ my $name = $2 // "lighttpd";
unless($username =~ m/^tools\.(.*)$/) {
ulog $username, 'error', "$rcfile:$line: unable to figure
out webgrid name! (not possible)";
next;
@@ -153,8 +153,6 @@
close PIPE;
}
}
-
-readconfig 'tools.csbot';
my $scoreboard = "/data/project/.system/bigbrother.scoreboard";
diff --git a/modules/toollabs/manifests/submit.pp
b/modules/toollabs/manifests/submit.pp
index 04af382..6e55519 100644
--- a/modules/toollabs/manifests/submit.pp
+++ b/modules/toollabs/manifests/submit.pp
@@ -67,5 +67,11 @@
mode => '0444',
source => 'puppet:///modules/toollabs/bigbrother.conf',
}
+
+ service { 'bigbrother':
+ require => File[ '/usr/local/sbin/bigbrother',
'/etc/init/bigbrother.conf' ],
+ ensure => running,
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/147432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1374a2acd17f9fdc3723049b0e1cb6a6e55abb9e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
