Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402382 )
Change subject: profile::analytics::database::meta::backup_dest: allow labs dir
perms
......................................................................
profile::analytics::database::meta::backup_dest: allow labs dir perms
Bug: T166248
Change-Id: I4f64a3e9344026cb56cc6d743092cc3e3f65ba97
---
M modules/profile/manifests/analytics/database/meta/backup_dest.pp
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Ottomata: Looks good to me, but someone else must approve
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/analytics/database/meta/backup_dest.pp
b/modules/profile/manifests/analytics/database/meta/backup_dest.pp
index 5c4d589..025cb65 100644
--- a/modules/profile/manifests/analytics/database/meta/backup_dest.pp
+++ b/modules/profile/manifests/analytics/database/meta/backup_dest.pp
@@ -8,11 +8,16 @@
$oozie_host =
hiera('profile::analytics::database::meta::backup_dest::oozie_host'),
) {
+ $backup_dir_group = $::realm ? {
+ 'production' => 'analytics-admins',
+ 'labs' => "project-${::labsproject}",
+ }
+
if !defined(File['/srv/backup']) {
file { '/srv/backup':
ensure => 'directory',
owner => 'root',
- group => 'analytics-admins',
+ group => $backup_dir_group,
mode => '0755',
}
}
@@ -23,7 +28,7 @@
]:
ensure => 'directory',
owner => 'root',
- group => 'analytics-admins',
+ group => $backup_dir_group,
mode => '0750',
}
--
To view, visit https://gerrit.wikimedia.org/r/402382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f64a3e9344026cb56cc6d743092cc3e3f65ba97
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
