[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: puppetize misc-dumps cron, which was missing

2016-12-12 Thread Jcrespo (Code Review) 
Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/325760 )

Change subject: mariadb: puppetize misc-dumps cron, which was missing
..


mariadb: puppetize misc-dumps cron, which was missing

Change-Id: Ib846cc42e2c44096b94295a0c16d3c11e6cc88a8
---
M modules/role/manifests/mariadb.pp
M modules/role/manifests/mariadb/backup.pp
2 files changed, 19 insertions(+), 8 deletions(-)

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



diff --git a/modules/role/manifests/mariadb.pp 
b/modules/role/manifests/mariadb.pp
index a856276..e0ff979 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -526,14 +526,6 @@
 lag_crit  => $lag_crit,
 warn_stopped  => $warn_stopped,
 }
-
-file { '/usr/local/bin/dumps-misc.sh':
-ensure  => present,
-owner   => 'root',
-group   => 'root',
-mode=> '0755',
-content => template('mariadb/dumps-misc.sh.erb'),
-}
 }
 
 # MariaDB 10 Analytics all-shards slave, with scratch space and TokuDB
diff --git a/modules/role/manifests/mariadb/backup.pp 
b/modules/role/manifests/mariadb/backup.pp
index 135b5cf..890d646 100644
--- a/modules/role/manifests/mariadb/backup.pp
+++ b/modules/role/manifests/mariadb/backup.pp
@@ -9,6 +9,14 @@
 mode   => '0600', # implicitly 0700 for dirs
 }
 
+file { '/usr/local/bin/dumps-misc.sh':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0755',
+content => template('mariadb/dumps-misc.sh.erb'),
+}
+
 file { '/etc/mysql/conf.d/dumps.cnf':
 ensure  => present,
 owner   => 'root',
@@ -17,6 +25,17 @@
 content => 
"[client]\nuser=${passwords::mysql::dump::user}\npassword=${passwords::mysql::dump::pass}\n",
 }
 
+cron { 'dumps-misc':
+minute  => 0,
+hour=> 1,
+weekday => 3,
+user=> 'root',
+command => '/usr/local/bin/dumps-misc.sh >/srv/dumps-misc.log 2>&1',
+require => [File['/usr/local/bin/dumps-misc.sh'],
+File['/srv/backups'],
+],
+}
+
 backup::mysqlset {'dbstore':
 xtrabackup   => false,
 per_db   => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib846cc42e2c44096b94295a0c16d3c11e6cc88a8
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: puppetize misc-dumps cron, which was missing

2016-12-07 Thread Jcrespo (Code Review) 
Jcrespo has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325760

Change subject: mariadb: puppetize misc-dumps cron, which was missing
..

mariadb: puppetize misc-dumps cron, which was missing

Change-Id: Ib846cc42e2c44096b94295a0c16d3c11e6cc88a8
---
M modules/role/manifests/mariadb.pp
M modules/role/manifests/mariadb/backup.pp
2 files changed, 19 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/325760/1

diff --git a/modules/role/manifests/mariadb.pp 
b/modules/role/manifests/mariadb.pp
index 4c53131..166fe60 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -527,14 +527,6 @@
 lag_crit  => $lag_crit,
 warn_stopped  => $warn_stopped,
 }
-
-file { '/usr/local/bin/dumps-misc.sh':
-ensure  => present,
-owner   => 'root',
-group   => 'root',
-mode=> '0755',
-content => template('mariadb/dumps-misc.sh.erb'),
-}
 }
 
 # MariaDB 10 Analytics all-shards slave, with scratch space and TokuDB
diff --git a/modules/role/manifests/mariadb/backup.pp 
b/modules/role/manifests/mariadb/backup.pp
index 135b5cf..7601dae 100644
--- a/modules/role/manifests/mariadb/backup.pp
+++ b/modules/role/manifests/mariadb/backup.pp
@@ -9,6 +9,14 @@
 mode   => '0600', # implicitly 0700 for dirs
 }
 
+file { '/usr/local/bin/dumps-misc.sh':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0755',
+content => template('mariadb/dumps-misc.sh.erb'),
+}
+
 file { '/etc/mysql/conf.d/dumps.cnf':
 ensure  => present,
 owner   => 'root',
@@ -17,6 +25,17 @@
 content => 
"[client]\nuser=${passwords::mysql::dump::user}\npassword=${passwords::mysql::dump::pass}\n",
 }
 
+cron { 'dumps-misc':
+minute  => 0,
+hour=> 1,
+weekday => 3,
+user=> 'root',
+command => "/usr/local/bin/dumps-misc.sh >/srv/dumps-misc.log 2>&1",
+require => [File['/usr/local/bin/dumps-misc.sh'],
+File['/srv/backups'],
+],
+}
+
 backup::mysqlset {'dbstore':
 xtrabackup   => false,
 per_db   => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib846cc42e2c44096b94295a0c16d3c11e6cc88a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 

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