Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/60336
Change subject: wikibugs - also need /var/lib/wikibugs/bin summarize needed
directories, set File defaults, retab 2-space softtabs, align arrows to make
puppet-lint like it more
......................................................................
wikibugs - also need /var/lib/wikibugs/bin
summarize needed directories, set File defaults,
retab 2-space softtabs, align arrows to make puppet-lint like
it more
Change-Id: I72956a74ab0c965297fc6801e88df3348122a7ab
---
M manifests/misc/wikibugs.pp
1 file changed, 48 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/60336/1
diff --git a/manifests/misc/wikibugs.pp b/manifests/misc/wikibugs.pp
index 9741379..2440f8f 100644
--- a/manifests/misc/wikibugs.pp
+++ b/manifests/misc/wikibugs.pp
@@ -8,13 +8,14 @@
# Package dependencies for the wikibugs script
class misc::irc::wikibugs::packages {
- package { 'libemail-mime-perl':
- ensure => present;
- }
+ package { 'libemail-mime-perl':
+ ensure => present;
+ }
}
class misc::irc::wikibugs {
+<<<<<<< HEAD
# We are an IRC bot!
# Some Bugzilla product have been blessed with their own log files out
of the
@@ -55,4 +56,48 @@
group => wikidev,
require => User['wikibugs'];
}
+=======
+ # We are an IRC bot!
+
+ # Some Bugzilla product have been blessed with their own log files out of the
+ # default one. Values are hardcoded in the Wikibugs perl script
+ $ircecho_logbase = '/var/lib/wikibugs/logs'
+ $ircecho_logs = {
+ "${ircecho_logbase}/wikimedia-labs.log" => '#wikimedia-labs',
+ "${ircecho_logbase}/wikimedia-mobile.log" => '#wikimedia-mobile',
+ "${ircecho_logbase}/wikimedia-dev.log" => '#wikimedia-dev',
+ }
+
+ $ircecho_nick = 'wikibugs'
+ $ircecho_server = 'chat.freenode.net'
+
+ include misc::ircecho
+ include misc::irc::wikibugs::packages
+
+ systemuser { 'wikibugs': name => 'wikibugs' }
+
+ File {
+ owner => wikibugs,
+ group => wikidev,
+ mode => '0755',
+ require => User['wikibugs'];
+ }
+
+ file {
+ '/var/lib/wikibugs':
+ ensure => directory;
+ '/var/lib/wikibugs/bin':
+ ensure => directory;
+ '/var/lib/wikibugs/log':
+ ensure => directory;
+ }
+
+ git::clone { 'wikibugs' :
+ directory => '/var/lib/wikibugs/bin',
+ origin =>
'https://gerrit.wikimedia.org/r/p/wikimedia/bugzilla/wikibugs.git',
+ owner => wikibugs,
+ group => wikidev,
+ require => User['wikibugs'];
+ }
+>>>>>>> f6b58a4... wikibugs: also need /var/lib/wikibugs/bin dir, summarize
needed dirs,
}
--
To view, visit https://gerrit.wikimedia.org/r/60336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72956a74ab0c965297fc6801e88df3348122a7ab
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
