[MediaWiki-commits] [Gerrit] Finish puppetizing wikibugs bot - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Finish puppetizing wikibugs bot
......................................................................


Finish puppetizing wikibugs bot

When deploying to mchenry, you'll need to update the filter from:
 wikibugs-irc: |/usr/local/bin/wikibugs.pl
to
 wikibugs-irc: |/var/lib/wikibugs/bin/wikibugs

PS4: (dz) - manual rebase / fix path conflict
            switch #mediawiki-feed to #wikimedia-dev

PS5: (dz) - don't use the -infile variable anymore

Change-Id: I1bb72bee199d3bf24750460c298f96392d8a1818
---
M manifests/misc/wikibugs.pp
M manifests/site.pp
2 files changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Demon: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/misc/wikibugs.pp b/manifests/misc/wikibugs.pp
index 3f573c3..30f3e4c 100644
--- a/manifests/misc/wikibugs.pp
+++ b/manifests/misc/wikibugs.pp
@@ -25,6 +25,7 @@
                "${ircecho_logbase}/wikimedia-mobile.log"         => 
"#wikimedia-mobile",
                "${ircecho_logbase}/wikimedia-dev.log"            => 
"#wikimedia-dev",
        }
+
        $ircecho_nick = "wikibugs"
        $ircecho_server = 'chat.freenode.net'
 
@@ -35,6 +36,7 @@
 
        file {
                "/var/lib/wikibugs/log":
+                       ensure => directory,
                        owner  => wikibugs,
                        group => wikidev,
                        mode  => 0775,
@@ -42,10 +44,10 @@
        }
 
        git::clone { "wikibugs" :
-               directory => "/var/lib/wikibugs/script",
+               directory => "/var/lib/wikibugs/bin",
                origin => 
"https://gerrit.wikimedia.org/r/p/wikimedia/bugzilla/wikibugs.git";,
                owner => wikibugs,
                group => wikidev,
-               require => File['/var/lib/wikibugs'];
+               require => User['wikibugs'];
        }
 }
diff --git a/manifests/site.pp b/manifests/site.pp
index 28d47a3..1923afb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1721,7 +1721,8 @@
                role::ldap::client::corp,
                backup::client,
                groups::wikidev,
-               accounts::jdavis
+               accounts::jdavis,
+               misc::irc::wikibugs
 
        include network::constants
 

-- 
To view, visit https://gerrit.wikimedia.org/r/53973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bb72bee199d3bf24750460c298f96392d8a1818
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <ch...@wikimedia.org>
Gerrit-Reviewer: Demon <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: MZMcBride <w...@mzmcbride.com>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits