Jgreen has submitted this change and it was merged.
Change subject: remove deprecated fundraising config
......................................................................
remove deprecated fundraising config
Change-Id: I44b1f7cf0b2da3ee031caf0d746a580e9e4b6923
---
M manifests/misc/fundraising.pp
M manifests/role/fundraising.pp
2 files changed, 0 insertions(+), 104 deletions(-)
Approvals:
Jgreen: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/fundraising.pp b/manifests/misc/fundraising.pp
index 00917ce..2b3e320 100644
--- a/manifests/misc/fundraising.pp
+++ b/manifests/misc/fundraising.pp
@@ -148,33 +148,6 @@
}
-class misc::fundraising::backup::dump_fundraising_database(
- $user = 'root',
- $hour,
- $minute,
- $weekday = '*'
- ) {
-
- file {
- '/usr/local/bin/dump_fundraisingdb':
- owner => 'root',
- group => 'root',
- mode => 0755,
- source =>
'puppet:///files/misc/scripts/dump_fundraisingdb',
- }
-
- cron {
- 'dump_fundraising_database':
- user => $user,
- weekday => $weekday,
- hour => $minute,
- minute => $hour,
- command => '/usr/local/bin/dump_fundraisingdb',
- ensure => present;
- }
-
-}
-
class misc::fundraising::backup::archive_sync(
$user = 'root',
$hour,
diff --git a/manifests/role/fundraising.pp b/manifests/role/fundraising.pp
index 1190e33..5a749ae 100644
--- a/manifests/role/fundraising.pp
+++ b/manifests/role/fundraising.pp
@@ -1,41 +1,6 @@
@monitor_group { "fundraising_eqiad": description => "fundraising eqiad" }
@monitor_group { "fundraising_pmtpa": description => "fundraising pmtpa" }
-class role::fundraising::messaging {
- $cluster = "fundraising"
- $nagios_group = "${cluster}_${::site}"
- include standard,
- groups::wikidev,
- admins::fr-tech
-
- monitor_service { "check_cclimbo":
- description => "check_cclimbo",
- check_command => "nsca-fail!1!'passive check_cclimbo is awol'",
- passive => "true",
- freshness => 300,
- retries => 2,
- contact_group => 'fundraising'
- }
- monitor_service { "check_donations":
- description => "check_donations",
- check_command => "nsca-fail!1!'passive check_donations is
awol'",
- passive => "true",
- freshness => 300,
- retries => 2,
- contact_group => 'fundraising'
- }
-}
-
-
-class role::fundraising::logger {
- $cluster = "fundraising"
- $nagios_group = "${cluster}_${::site}"
- include standard,
- groups::wikidev,
- admins::fr-tech
-}
-
-
class role::fundraising::civicrm {
# variables used in fundraising exim template
$exim_signs_dkim = "true"
@@ -63,46 +28,4 @@
nrpe
monitor_service { "smtp": description => "Exim SMTP", check_command =>
"check_smtp" }
monitor_service { "http": description => "HTTP", check_command =>
"check_http" }
-}
-
-
-class role::fundraising::database {
- $cluster = "fundraising"
- $nagios_group = "${cluster}_${::site}"
-
- system::role { "role::fundraising::database": description =>
"Fundraising Database (${mysql_role})" }
-
- include standard,
- mysql_wmf,
- mysql_wmf::conf,
- mysql_wmf::datadirs,
- mysql_wmf::mysqluser,
- mysql_wmf::packages
-
-}
-
-
-class role::fundraising::database::master {
- $mysql_role = "master"
- $writable = true
- include role::fundraising::database
- monitor_service { "mysqld": description => "mysqld processes",
check_command => "nrpe_check_mysqld", critical => true }
-}
-
-
-class role::fundraising::database::slave {
- $mysql_role = "slave"
- include role::fundraising::database
- monitor_service { "mysql slave delay": description => "MySQL Slave
Delay", check_command => "nrpe_check_mysql_slave_delay", critical => true }
- monitor_service { "mysql slave running": description => "MySQL Slave
Running", check_command => "nrpe_check_mysql_slave_running", critical => true }
- monitor_service { "mysqld": description => "mysqld processes",
check_command => "nrpe_check_mysqld", critical => true }
-}
-
-
-class role::fundraising::database::dump_slave {
- system::role { "role::fundraising::database::dump": description =>
"Fundraising Database Dump/Backup" }
- include role::fundraising::database::slave,
- misc::fundraising::backup::backupmover_user
-
- class { 'misc::fundraising::backup::dump_fundraising_database': hour =>
9, minute => 0 }
}
--
To view, visit https://gerrit.wikimedia.org/r/96153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I44b1f7cf0b2da3ee031caf0d746a580e9e4b6923
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen <[email protected]>
Gerrit-Reviewer: Jgreen <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
