[MediaWiki-commits] [Gerrit] Backup geowiki's data-private bare repository - change (operations/puppet)

[Akosiaris (Code Review)]

Akosiaris has submitted this change and it was merged.

Change subject: Backup geowiki's data-private bare repository
......................................................................


Backup geowiki's data-private bare repository

The bare repository is not in gerrit, as it contains "foundation only"
data, and we do not trust gerrit to keep it private. So we backup the
repository separately.

Change-Id: Icbb54de9ca353abad31828bf2c7a1f4524ff4b02
---
M manifests/misc/statistics.pp
M manifests/role/backup.pp
2 files changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Akosiaris: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index f0e176b..73f45ae 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -919,8 +919,12 @@
     }
 
     # The bare repository lives on stat1, so it's available there directly.
+    # It only needs backup (as the repo is not living in gerrit)
     # Other hosts need to rsync it over
-    if $::hostname != 
$misc::statistics::geowiki::params::private_data_bare_host {
+    if $::hostname == 
$misc::statistics::geowiki::params::private_data_bare_host {
+        include backup::host
+        backup::set { 'a-geowiki-data-private-bare': }
+    } else {
         cron { 'geowiki data-private bare sync':
             command => "/usr/bin/rsync -rt --delete 
rsync://${misc::statistics::geowiki::params::private_data_bare_host_fqdn}${misc::statistics::geowiki::params::private_data_bare_path}/
 ${misc::statistics::geowiki::params::private_data_bare_path}/",
             require => 
File[$misc::statistics::geowiki::params::private_data_bare_path],
diff --git a/manifests/role/backup.pp b/manifests/role/backup.pp
index 03d8105..01a6157 100644
--- a/manifests/role/backup.pp
+++ b/manifests/role/backup.pp
@@ -11,6 +11,7 @@
     include backup::host
     include role::backup::config
     include passwords::bacula
+    require misc::statistics::geowiki::params
 
     system::role { 'role::backup::director': description => 'Backup server' }
 
@@ -72,6 +73,9 @@
     bacula::director::fileset { 'a-eventlogging':
         includes => [ '/a/eventlogging' ]
     }
+    bacula::director::fileset { 'a-geowiki-data-private-bare':
+        includes => [ 
$misc::statistics::geowiki::params::private_data_bare_path ]
+    }
     bacula::director::fileset { 'home':
         includes => [ '/home' ]
     }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbb54de9ca353abad31828bf2c7a1f4524ff4b02
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <christ...@quelltextlich.at>
Gerrit-Reviewer: Akosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: QChris <christ...@quelltextlich.at>
Gerrit-Reviewer: jenkins-bot

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