From 253b26745304d3a07aeaab8a9617263ddd8b4acd Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@debian.org>
Date: Mon, 5 Jul 2021 23:19:05 -0700
Subject: [PATCH] Set libera_staff = true in all managed channels

Practically this will give +o to litharge.

Change-Id: I378b3fbcfde45a09371cbccec5ba380d5004b2ea
---
 .pipeline/blubber.yaml                | 2 +-
 channels/mediawiki.toml               | 2 +-
 channels/pywikibot.toml               | 3 +--
 channels/wikimedia-dev.toml           | 2 +-
 channels/wikimedia-editing.toml       | 2 +-
 channels/wikimedia-hackathon.toml     | 2 +-
 channels/wikimedia-kawaii.toml        | 2 +-
 channels/wikimedia-operations.toml    | 2 +-
 channels/wikimedia-serviceops.toml    | 2 +-
 channels/wikimedia-sre.toml           | 2 +-
 channels/wikipedia-abstract-tech.toml | 2 +-
 11 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.pipeline/blubber.yaml b/.pipeline/blubber.yaml
index aba3a46..72d77d9 100644
--- a/.pipeline/blubber.yaml
+++ b/.pipeline/blubber.yaml
@@ -12,7 +12,7 @@ variants:
         - "--git"
         - "https://gerrit.wikimedia.org/r/wikimedia/irc/ircservserv"
         - "--rev"
-        - b2d00ed
+        - 75f22c1
   validate:
     copies:
       - from: prep
diff --git a/channels/mediawiki.toml b/channels/mediawiki.toml
index 9be3842..f0cb049 100644
--- a/channels/mediawiki.toml
+++ b/channels/mediawiki.toml
@@ -24,7 +24,7 @@ ops = [
     "[1997kB]",
 ]
 plus_o = [
-    "*!*@libera/staff/*",
     "wmopbot",
 ]
 global_bans = true
+libera_staff = true
diff --git a/channels/pywikibot.toml b/channels/pywikibot.toml
index cd10a04..b50ce35 100644
--- a/channels/pywikibot.toml
+++ b/channels/pywikibot.toml
@@ -13,8 +13,6 @@ ops = [
     "c",
 ]
 plus_o = [
-    "*!*@libera/staff/*",
-    "litharge",
     "wmopbot",
 ]
 autovoice = [
@@ -24,3 +22,4 @@ autovoice = [
     "wmopbot",
 ]
 global_bans = true
+libera_staff = true
diff --git a/channels/wikimedia-dev.toml b/channels/wikimedia-dev.toml
index 26cd4e0..5055ea8 100644
--- a/channels/wikimedia-dev.toml
+++ b/channels/wikimedia-dev.toml
@@ -8,10 +8,10 @@ crats = [
 ops = [
 ]
 plus_o = [
-    "*!*@libera/staff/*",
     "wmopbot",
 ]
 autovoice = [
     "wikibugs",
 ]
 global_bans = true
+libera_staff = true
diff --git a/channels/wikimedia-editing.toml b/channels/wikimedia-editing.toml
index 90a8815..3010117 100644
--- a/channels/wikimedia-editing.toml
+++ b/channels/wikimedia-editing.toml
@@ -12,10 +12,10 @@ ops = [
     "legoktm",
 ]
 plus_o = [
-    "*!*@libera/staff/*",
     "wmopbot",
 ]
 autovoice = [
     "wikibugs",
 ]
 global_bans = true
+libera_staff = true
diff --git a/channels/wikimedia-hackathon.toml b/channels/wikimedia-hackathon.toml
index 5bdb86c..081b73f 100644
--- a/channels/wikimedia-hackathon.toml
+++ b/channels/wikimedia-hackathon.toml
@@ -13,7 +13,7 @@ ops = [
     "Reedy",
 ]
 plus_o = [
-    "*!*@libera/staff/*",
     "wmopbot",
 ]
 global_bans = true
+libera_staff = true
diff --git a/channels/wikimedia-kawaii.toml b/channels/wikimedia-kawaii.toml
index 610187e..b85e494 100644
--- a/channels/wikimedia-kawaii.toml
+++ b/channels/wikimedia-kawaii.toml
@@ -11,7 +11,7 @@ ops = [
     "ashley"
 ]
 plus_o = [
-    "*!*@libera/staff/*",
     "wmopbot",
 ]
 global_bans = true
+libera_staff = true
diff --git a/channels/wikimedia-operations.toml b/channels/wikimedia-operations.toml
index 22a1de6..4b0566e 100644
--- a/channels/wikimedia-operations.toml
+++ b/channels/wikimedia-operations.toml
@@ -10,7 +10,6 @@ ops = [
     "manuel",
 ]
 plus_o = [
-    "*!*@libera/staff/*",
     "wmopbot",
 ]
 autovoice = [
@@ -25,3 +24,4 @@ autovoice = [
     "wm-bot",
 ]
 global_bans = true
+libera_staff = true
diff --git a/channels/wikimedia-serviceops.toml b/channels/wikimedia-serviceops.toml
index 625493a..2176b33 100644
--- a/channels/wikimedia-serviceops.toml
+++ b/channels/wikimedia-serviceops.toml
@@ -14,10 +14,10 @@ crats = [
 ops = [
 ]
 plus_o = [
-    "*!*@libera/staff/*",
     "wmopbot",
 ]
 autovoice = [
     "wikibugs",
 ]
 global_bans = true
+libera_staff = true
diff --git a/channels/wikimedia-sre.toml b/channels/wikimedia-sre.toml
index 289e86c..7c58c01 100644
--- a/channels/wikimedia-sre.toml
+++ b/channels/wikimedia-sre.toml
@@ -11,7 +11,7 @@ ops = [
     "manuel",
 ]
 plus_o = [
-    "*!*@libera/staff/*",
     "wmopbot",
 ]
 global_bans = true
+libera_staff = true
diff --git a/channels/wikipedia-abstract-tech.toml b/channels/wikipedia-abstract-tech.toml
index d5e0602..40a605d 100644
--- a/channels/wikipedia-abstract-tech.toml
+++ b/channels/wikipedia-abstract-tech.toml
@@ -11,10 +11,10 @@ ops = [
     "legoktm",
 ]
 plus_o = [
-    "*!*@libera/staff/*",
     "wmopbot",
 ]
 autovoice = [
     "wikibugs",
 ]
 global_bans = true
+libera_staff = true