Pyoungmeister has submitted this change and it was merged.
Change subject: labsdb: don't repl private wikis
......................................................................
labsdb: don't repl private wikis
also create $::private_wikis global in realm.pp
Change-Id: If79588d546f35a73b8560cc0631731c6056db1d5
---
M manifests/realm.pp
M manifests/site.pp
M modules/mysql_multi_instance/manifests/instance.pp
3 files changed, 40 insertions(+), 3 deletions(-)
Approvals:
Pyoungmeister: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/realm.pp b/manifests/realm.pp
index ccb0170..cade654 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -66,6 +66,36 @@
# Default group
$gid = 500
+## puppet-accessible list of private wikis
+## please keep alphabetized
+$private_wikis = [ 'arbcom_dewiki',
+ 'arbcom_enwiki',
+ 'arbcom_fiwiki',
+ 'arbcom_nlwiki',
+ 'auditcomwiki',
+ 'boardgovcomwiki',
+ 'boardwiki',
+ 'chairwiki',
+ 'chapcomwiki',
+ 'checkuserwiki',
+ 'collabwiki',
+ 'execwiki',
+ 'fdcwiki',
+ 'grantswiki',
+ 'ilwikimedia',
+ 'internalwiki',
+ 'movementroleswiki',
+ 'noboard_chapterswikimedia',
+ 'officewiki',
+ 'ombudsmenwiki',
+ 'otrs_wikiwiki',
+ 'searchcomwiki',
+ 'spcomwiki',
+ 'stewardwiki',
+ 'transitionteamwiki',
+ 'wg_enwiki',
+ 'wikimaniateamwiki', ]
+
# Route list for mail coming from MediaWiki mailer
$exim_mediawiki_route_list = $::realm ? {
'production' => 'smtp.pmtpa.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index a5fbd0d..eada533 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -682,7 +682,8 @@
's3' => {
'port' => 3306,
'innodb_log_file_size' => "500M",
- 'ram' => "24G"
+ 'ram' => "24G",
+ 'repl_ignore_dbs' => $::private_wikis,
},
's6' => {
'port' => 3307,
@@ -1115,7 +1116,7 @@
# These cron jobs were left behind for some reason:
# No external IP, so no HTTPS access
class { misc::maintenance::tor_exit_node: enabled => true }
-
+
# foreachwikiindblist broken
class { misc::maintenance::geodata: enabled => true }
@@ -2697,7 +2698,7 @@
admins::restricted,
nrpe
-
+
class { misc::maintenance::foundationwiki: enabled => true }
class { misc::maintenance::pagetriage: enabled => true }
class { misc::maintenance::translationnotifications: enabled => true }
diff --git a/modules/mysql_multi_instance/manifests/instance.pp
b/modules/mysql_multi_instance/manifests/instance.pp
index 6657c69..ef9c9dd 100644
--- a/modules/mysql_multi_instance/manifests/instance.pp
+++ b/modules/mysql_multi_instance/manifests/instance.pp
@@ -4,6 +4,11 @@
$port = $instances[$name]['port']
$innodb_log_file_size = $instances[$name]['innodb_log_file_size']
$ram = $instances[$name]['ram']
+ if has_key( $instances[$name], 'repl_ignore_dbs') {
+ $repl_ignore_dbs = $instances[$name]['repl_ignore_dbs']
+ }else {
+ $repl_ignore_dbs = false
+ }
$serverid = inline_template("<%= ia = ipaddress.split('.'); server_id =
ia[0] + ia[2] + ia[3] + String($port); server_id %>")
include passwords::nagios::mysql
@@ -98,6 +103,7 @@
'query_cache_type' => 0,
'log_slow_verbosity' => "Query_plan",
'optimizer_switch' =>
'\'mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=off\'',
+ 'replicate-ignore-db' => $repl_ignore_dbs,
},
'mysqldump' => {
'quick' => true,
--
To view, visit https://gerrit.wikimedia.org/r/59868
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If79588d546f35a73b8560cc0631731c6056db1d5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <[email protected]>
Gerrit-Reviewer: Pyoungmeister <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
