Ottomata has submitted this change and it was merged.
Change subject: More stuff to set up stat1002 as private data host
......................................................................
More stuff to set up stat1002 as private data host
Change-Id: I041aa8fe436ef048e3207426dcb7bc4dfc60f5d1
---
M files/backup/disklist-daily
M files/backup/disklist-monthly
M files/backup/disklist-weekly
M files/rsync/rsyncd.conf.downloadprimary
M manifests/misc/udp2log.pp
M manifests/role/logging.pp
6 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/files/backup/disklist-daily b/files/backup/disklist-daily
index b495f9e..4d817be 100644
--- a/files/backup/disklist-daily
+++ b/files/backup/disklist-daily
@@ -16,5 +16,7 @@
manganese.wikimedia.org /var/lib/gerrit2/review_site/git default
sodium.wikimedia.org /var/lib/mailman default
stat1.wikimedia.org /home default
-stat1.wikimedia.org /a/eventlogging default
-virt0.wikimedia.org /a/backup default
+stat1.wikimedia.org /a/eventlogging default
+stat1002.eqiad.wmnet /home default
+stat1002.eqiad.wmnet /a/eventlogging default
+virt0.wikimedia.org /a/backup default
diff --git a/files/backup/disklist-monthly b/files/backup/disklist-monthly
index 4334efb..d6bed47 100644
--- a/files/backup/disklist-monthly
+++ b/files/backup/disklist-monthly
@@ -6,3 +6,5 @@
grosley.wikimedia.org /var/lib/jenkins/backups default
stat1.wikimedia.org /home default
stat1.wikimedia.org /a/eventlogging default
+stat1002.eqiad.wmnet /home default
+stat1002.eqiad.wmnet /a/eventlogging default
diff --git a/files/backup/disklist-weekly b/files/backup/disklist-weekly
index 4334efb..d6bed47 100644
--- a/files/backup/disklist-weekly
+++ b/files/backup/disklist-weekly
@@ -6,3 +6,5 @@
grosley.wikimedia.org /var/lib/jenkins/backups default
stat1.wikimedia.org /home default
stat1.wikimedia.org /a/eventlogging default
+stat1002.eqiad.wmnet /home default
+stat1002.eqiad.wmnet /a/eventlogging default
diff --git a/files/rsync/rsyncd.conf.downloadprimary
b/files/rsync/rsyncd.conf.downloadprimary
index ab229a6..b6cd900 100644
--- a/files/rsync/rsyncd.conf.downloadprimary
+++ b/files/rsync/rsyncd.conf.downloadprimary
@@ -24,14 +24,14 @@
# for sagres.c3sl.ufpr.br, contact: Carlos Carvalho <car...@fisica.ufpr.br>
hosts allow = sagres.c3sl.ufpr.br
-# write access from stat1 to pagecounts-ez directory.
+# write access from stat1 and stat1002 to pagecounts-ez directory.
# Erik Z uses this. See RT 2162.
[pagecounts-ez]
uid = backup
gid = wikidev
read only = false
path = /data/xmldatadumps/public/other/pagecounts-ez
-hosts allow = stat1.wikimedia.org
+hosts allow = stat1.wikimedia.org stat1002.eqiad.wmnet
# lucene search logs are rsynced from stat1 or oxygen.
[search-logs]
diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index 0de1f56..74ecd10 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -75,7 +75,7 @@
#
class misc::udp2log::rsyncd(
$path = "/var/log/udp2log/archive",
- $hosts_allow = "208.80.152.146") {
+ $hosts_allow = "208.80.152.146 10.64.0.16") {
# Set up an rsync daemon module for $path.
# This allows stat1 to copy logs from the
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index a717cff..a057d2c 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -273,6 +273,6 @@
}
class { '::eventlogging':
- archive_destinations => [ 'stat1.wikimedia.org' ],
+ archive_destinations => [ 'stat1.wikimedia.org',
'stat1002.eqiad.wmnet' ],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/62084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I041aa8fe436ef048e3207426dcb7bc4dfc60f5d1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
