Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327186 )
Change subject: mariadb: Move backup templates to subdir on the right position
......................................................................
mariadb: Move backup templates to subdir on the right position
This is in preparation for a second commit fixing backup problems.
Change-Id: Ifcea80c87dbe87fd3431371942a5a4c44d8b29b3
---
M modules/role/manifests/mariadb/backup.pp
M modules/role/manifests/mariadb/otrsbackups.pp
R modules/role/templates/mariadb/backups/dumps-misc.sh.erb
R modules/role/templates/mariadb/backups/dumps-otrs.sh.erb
4 files changed, 2 insertions(+), 2 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/backup.pp
b/modules/role/manifests/mariadb/backup.pp
index 890d646..4b9ae8e 100644
--- a/modules/role/manifests/mariadb/backup.pp
+++ b/modules/role/manifests/mariadb/backup.pp
@@ -14,7 +14,7 @@
owner => 'root',
group => 'root',
mode => '0755',
- content => template('mariadb/dumps-misc.sh.erb'),
+ content => template('mariadb/backups/dumps-misc.sh.erb'),
}
file { '/etc/mysql/conf.d/dumps.cnf':
diff --git a/modules/role/manifests/mariadb/otrsbackups.pp
b/modules/role/manifests/mariadb/otrsbackups.pp
index ac98c75..e717a49 100644
--- a/modules/role/manifests/mariadb/otrsbackups.pp
+++ b/modules/role/manifests/mariadb/otrsbackups.pp
@@ -12,7 +12,7 @@
owner => 'root',
group => 'root',
mode => '0755',
- content => template('mariadb/dumps-otrs.sh.erb'),
+ content => template('mariadb/backups/dumps-otrs.sh.erb'),
}
cron { 'otrsbackups':
diff --git a/templates/mariadb/dumps-misc.sh.erb
b/modules/role/templates/mariadb/backups/dumps-misc.sh.erb
similarity index 100%
rename from templates/mariadb/dumps-misc.sh.erb
rename to modules/role/templates/mariadb/backups/dumps-misc.sh.erb
diff --git a/templates/mariadb/dumps-otrs.sh.erb
b/modules/role/templates/mariadb/backups/dumps-otrs.sh.erb
similarity index 100%
rename from templates/mariadb/dumps-otrs.sh.erb
rename to modules/role/templates/mariadb/backups/dumps-otrs.sh.erb
--
To view, visit https://gerrit.wikimedia.org/r/327186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcea80c87dbe87fd3431371942a5a4c44d8b29b3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Marostegui <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
