Dzahn has submitted this change and it was merged.
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
write dependencies as arrow syntax vs. requires
Change-Id: I72956a74ab0c965297fc6801e88df3348122a7ab
---
M manifests/misc/wikibugs.pp
1 file changed, 41 insertions(+), 37 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/misc/wikibugs.pp b/manifests/misc/wikibugs.pp
index 9741379..6780c8b 100644
--- a/manifests/misc/wikibugs.pp
+++ b/manifests/misc/wikibugs.pp
@@ -8,51 +8,55 @@
# 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 {
- # We are an IRC bot!
+ # 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',
- }
+ # 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'
+ $ircecho_nick = 'wikibugs'
+ $ircecho_server = 'chat.freenode.net'
- include misc::ircecho
- include misc::irc::wikibugs::packages
+ include misc::ircecho
+ include misc::irc::wikibugs::packages
- systemuser { 'wikibugs': name = 'wikibugs' }
+ systemuser { 'wikibugs': name = 'wikibugs' }
- file {
- '/var/lib/wikibugs':
- ensure = directory,
- owner = wikibugs,
- group = wikidev,
- mode = '0755';
- '/var/lib/wikibugs/log':
- ensure = directory,
- owner = wikibugs,
- group = wikidev,
- mode = '0775',
- require = User['wikibugs'];
- }
+ File {
+owner = 'wikibugs',
+group = 'wikidev',
+mode= '0755',
+ }
- 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'];
- }
+ file {
+'/var/lib/wikibugs':
+ ensure = directory;
+'/var/lib/wikibugs/bin':
+ ensure = directory;
+'/var/lib/wikibugs/log':
+ ensure = directory;
+ }
+
+ User['wikibugs'] - File['/var/lib/wikibugs'] -
+ File['/var/lib/wikibugs/bin'] - File['/var/lib/wikibugs/log']
+
+ 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'];
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/60336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72956a74ab0c965297fc6801e88df3348122a7ab
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
