ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/396915 )
Change subject: make all incoming rsyncs of datasets to datasets servers run as
dumpsgen
......................................................................
make all incoming rsyncs of datasets to datasets servers run as dumpsgen
also use values in hiera for paths where files go, rather than
hardcoded paths, in the profile manifests
Bug: T113467
Change-Id: I79ee9d4cebc86503b6968df729942b67212d4f5d
---
M modules/dumps/manifests/web/fetches/kiwix.pp
M modules/dumps/manifests/web/fetches/stats.pp
M modules/profile/manifests/dumps/fetcher.pp
3 files changed, 8 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/396915/1
diff --git a/modules/dumps/manifests/web/fetches/kiwix.pp
b/modules/dumps/manifests/web/fetches/kiwix.pp
index 2d5c71f..8c9397e 100644
--- a/modules/dumps/manifests/web/fetches/kiwix.pp
+++ b/modules/dumps/manifests/web/fetches/kiwix.pp
@@ -4,7 +4,6 @@
$publicdir = undef,
$otherdir = undef,
) {
- include dumps::deprecated::user
require_package('rsync')
file { "${publicdir}/kiwix":
@@ -26,7 +25,7 @@
ensure => 'present',
environment => 'MAILTO=ops-du...@wikimedia.org',
command => "/bin/bash /usr/local/bin/kiwix-rsync-cron.sh
${otherdir}",
- user => $group,
+ user => $user,
minute => '15',
hour => '*/2',
require => File['/usr/local/bin/kiwix-rsync-cron.sh'],
diff --git a/modules/dumps/manifests/web/fetches/stats.pp
b/modules/dumps/manifests/web/fetches/stats.pp
index aa666d6..2f3cec5 100644
--- a/modules/dumps/manifests/web/fetches/stats.pp
+++ b/modules/dumps/manifests/web/fetches/stats.pp
@@ -3,8 +3,6 @@
$otherdir = undef,
$user = undef,
) {
- include ::dumps::deprecated::user
-
# Copies over the mediacounts files from an rsyncable location.
dumps::web::fetches::job { 'mediacounts':
source => "${src}/mediacounts",
diff --git a/modules/profile/manifests/dumps/fetcher.pp
b/modules/profile/manifests/dumps/fetcher.pp
index 9933bca..5faa8de 100644
--- a/modules/profile/manifests/dumps/fetcher.pp
+++ b/modules/profile/manifests/dumps/fetcher.pp
@@ -1,17 +1,17 @@
-class profile::dumps::fetcher {
- $publicdir = '/data/xmldatadumps/public'
- $otherdir = '/data/xmldatadumps/public/other'
-
+class profile::dumps::fetcher(
+ $publicdir = hiera('profile::dumps::xmldumpspublicdir'),
+ $otherdir = hiera('profile::dumps::miscdumpspublicdir'),
+) {
class {'dumps::web::fetches::kiwix':
- user => 'datasets',
- group => 'datasets',
+ user => 'dumpsgen',
+ group => 'dumpsgen',
publicdir => $publicdir,
otherdir => $otherdir,
}
class {'dumps::web::fetches::stats':
src => 'stat1005.eqiad.wmnet::hdfs-archive',
otherdir => $otherdir,
- user => 'datasets',
+ user => 'dumpsgen',
}
class {'dumps::web::fetches::wikitech_dumps':
url => 'https://wikitech.wikimedia.org/dumps/',
--
To view, visit https://gerrit.wikimedia.org/r/396915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79ee9d4cebc86503b6968df729942b67212d4f5d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
