ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/280830
Change subject: dumps: make dir var references easier on the eyes in the
manifests
......................................................................
dumps: make dir var references easier on the eyes in the manifests
Change-Id: Ib617e602512e4d8749e168525331e22f3b5c4167
---
M modules/snapshot/manifests/addschanges/config.pp
M modules/snapshot/manifests/addschanges/templates.pp
M modules/snapshot/manifests/dumps/configs.pp
M modules/snapshot/manifests/dumps/pagetitles.pp
M modules/snapshot/manifests/dumps/templates.pp
M modules/snapshot/manifests/mediaperprojectlists.pp
M modules/snapshot/manifests/wikiqueryskip.pp
7 files changed, 60 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/280830/1
diff --git a/modules/snapshot/manifests/addschanges/config.pp
b/modules/snapshot/manifests/addschanges/config.pp
index 1bdf2dd..149e1fd 100644
--- a/modules/snapshot/manifests/addschanges/config.pp
+++ b/modules/snapshot/manifests/addschanges/config.pp
@@ -4,34 +4,37 @@
include snapshot::dumps::dirs
+ $confsdir = ${snapshot::dumps::dirs::addschangesdir}/confs
+ $dblistsdir = ${snapshot::dumps::dirs::addschangesdir}/dblists
+
if ($enable) {
- file { "${snapshot::dumps::dirs::addschangesdir}/confs":
+ file { $confsdir:
ensure => 'directory',
- path => "${snapshot::dumps::dirs::addschangesdir}/confs",
+ path => $confsdir,
mode => '0755',
owner => 'root',
group => 'root',
}
- file {
"${snapshot::dumps::dirs::addschangesdir}/confs/addschanges.conf":
+ file { "${confsdir}/addschanges.conf":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::addschangesdir}/confs/addschanges.conf",
+ path => "${confsdir}/addschanges.conf",
mode => '0755',
owner => 'root',
group => 'root',
content => template('snapshot/addschanges.conf.erb'),
}
- file { "${snapshot::dumps::dirs::addschangesdir}/dblists":
+ file { $dblistsdir:
ensure => 'directory',
- path => "${snapshot::dumps::dirs::addschangesdir}/dblists",
+ path => dblistsdir,
mode => '0755',
owner => 'root',
group => 'root',
}
$skipdbs = ['labswiki','labtestwiki']
$skipdbs_dblist = join($skipdbs, "\n")
- file { "${snapshot::dumps::dirs::addschangesdir}/dblists/skip.dblist":
+ file { "${dblistsdir}/dblists/skip.dblist":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::addschangesdir}/dblists/skip.dblist",
+ path => "${dblistsdir}/skip.dblist",
mode => '0755',
owner => 'root',
group => 'root',
diff --git a/modules/snapshot/manifests/addschanges/templates.pp
b/modules/snapshot/manifests/addschanges/templates.pp
index 0d536bf..a11769a 100644
--- a/modules/snapshot/manifests/addschanges/templates.pp
+++ b/modules/snapshot/manifests/addschanges/templates.pp
@@ -2,17 +2,18 @@
if ($enable) {
include snapshot::dumps::dirs
+ $templsdir = "${snapshot::dumps::dirs::addschangesdir}/templs"
- file { "${snapshot::dumps::dirs::addschangesdir}/templs":
+ file { $templsdir:
ensure => 'directory',
- path => "${snapshot::dumps::dirs::addschangesdir}/templs",
+ path => $templsdir,
mode => '0755',
owner => 'root',
group => 'root',
}
- file {
"${snapshot::dumps::dirs::addschangesdir}/templs/incrs-index.html":
+ file { "${templsdir}/incrs-index.html":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::addschangesdir}/templs/incrs-index.html",
+ path => "${templsdir}/incrs-index.html",
mode => '0644',
owner => 'root',
group => 'root',
@@ -21,9 +22,9 @@
$warning = "The files in this directory are maintained by puppet!\n"
$location = "puppet:///modules/snapshot/dumps/addschanges/templates\n"
- file { "${snapshot::dumps::dirs::addschangesdir}/templs/README":
+ file { "${templsdir}/README":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::addschangesdir}/templs/README",
+ path => "${templsdir}/README",
mode => '0644',
owner => 'root',
group => 'root',
diff --git a/modules/snapshot/manifests/dumps/configs.pp
b/modules/snapshot/manifests/dumps/configs.pp
index 17550bd..fc5c8e0 100644
--- a/modules/snapshot/manifests/dumps/configs.pp
+++ b/modules/snapshot/manifests/dumps/configs.pp
@@ -6,10 +6,11 @@
include snapshot::dumps::dirs
$dblistsdir = $snapshot::dumps::dirs::dblistsdir
+ $apachedir = $snapshot::dumps::dirs::apachedir
$config = {
smallwikis => {
- dblist =>
"${snapshot::dumps::dirs::apachedir}/dblists/all.dblist",
+ dblist => "${apachedir}/dblists/all.dblist",
skipdblist => "${dblistsdir}/skip.dblist",
keep => '12',
chunksEnabled => '0',
@@ -109,13 +110,13 @@
},
},
monitor => {
- dblist =>
"${snapshot::dumps::dirs::apachedir}/dblists/all.dblist",
+ dblist => "${apachedir}/dblists/all.dblist",
skipdblist => "${dblistsdir}/skipmonitor.dblist",
keep => '30',
chunksEnabled => '0',
},
media => {
- dblist =>
"${snapshot::dumps::dirs::apachedir}/dblists/all.dblist",
+ dblist => "${apachedir}/dblists/all.dblist",
skipdblist => "${dblistsdir}/globalusage.dblist",
keep => '30',
chunksEnabled => '0',
diff --git a/modules/snapshot/manifests/dumps/pagetitles.pp
b/modules/snapshot/manifests/dumps/pagetitles.pp
index a2373a9..666ecfc 100644
--- a/modules/snapshot/manifests/dumps/pagetitles.pp
+++ b/modules/snapshot/manifests/dumps/pagetitles.pp
@@ -12,17 +12,19 @@
$ensure = 'absent'
}
- file { "${snapshot::dumps::dirs::datadir}/public/other/pagetitles":
+ $otherdir = "${snapshot::dumps::dirs::datadir}/public/other/pagetitles"
+
+ file { $otherdir:
ensure => 'directory',
- path => "${snapshot::dumps::dirs::datadir}/public/other/pagetitles",
+ path => $otherdir,
mode => '0755',
owner => $user,
group => root,
}
- file { "${snapshot::dumps::dirs::datadir}/public/other/mediatitles":
+ file { "${otherdir}/mediatitles":
ensure => 'directory',
- path => "${snapshot::dumps::dirs::datadir}/public/other/mediatitles",
+ path => "${otherdir}/mediatitles",
mode => '0755',
owner => $user,
group => root,
@@ -32,29 +34,31 @@
ensure => $ensure,
environment => '[email protected]',
user => $user,
- command => "find
${snapshot::dumps::dirs::datadir}/public/other/pagetitles/ -maxdepth 1 -type d
-mtime +90 -exec rm -rf {} \\; ; find
${snapshot::dumps::dirs::datadir}/public/other/mediatitles/ -maxdepth 1 -type d
-mtime +90 -exec rm -rf {} \\;",
+ command => "find ${otherdir}/pagetitles/ -maxdepth 1 -type d
-mtime +90 -exec rm -rf {} \\; ; find ${otherdir}/mediatitles/ -maxdepth 1
-type d -mtime +90 -exec rm -rf {} \\;",
minute => '0',
hour => '8',
}
+
+ $scriptsdir = $snapshot::dumps::dirs::scriptsdir
cron { 'pagetitles-ns0':
ensure => $ensure,
environment => '[email protected]',
user => $user,
- command => "cd ${snapshot::dumps::dirs::scriptsdir}; python
onallwikis.py --configfile confs/wikidump.conf.monitor --filenameformat
'{w}-{d}-all-titles-in-ns-0.gz' --outdir
'${snapshot::dumps::dirs::datadir}/public/other/pagetitles/{d}' --query
\"'select page_title from page where page_namespace=0;'\"",
+ command => "cd ${scriptsdir}; python onallwikis.py --configfile
confs/wikidump.conf.monitor --filenameformat '{w}-{d}-all-titles-in-ns-0.gz'
--outdir '${otherdir}/pagetitles/{d}' --query \"'select page_title from page
where page_namespace=0;'\"",
minute => '10',
hour => '8',
- require =>
File["${snapshot::dumps::dirs::datadir}/public/other/pagetitles"],
+ require => File["${otherdir}/pagetitles"],
}
cron { 'pagetitles-ns6':
ensure => $ensure,
environment => '[email protected]',
user => $user,
- command => "cd ${snapshot::dumps::dirs::scriptsdir}; python
onallwikis.py --configfile confs/wikidump.conf.monitor --filenameformat
'{w}-{d}-all-media-titles.gz' --outdir
'${snapshot::dumps::dirs::datadir}/public/other/mediatitles/{d}' --query
\"'select page_title from page where page_namespace=6;'\"",
+ command => "cd ${scriptsdir}; python onallwikis.py --configfile
confs/wikidump.conf.monitor --filenameformat '{w}-{d}-all-media-titles.gz'
--outdir '${otherdir}/mediatitles/{d}' --query \"'select page_title from page
where page_namespace=6;'\"",
minute => '50',
hour => '8',
- require =>
File["${snapshot::dumps::dirs::datadir}/public/other/mediatitles"],
+ require => File["${otherdir}/mediatitles"],
}
}
diff --git a/modules/snapshot/manifests/dumps/templates.pp
b/modules/snapshot/manifests/dumps/templates.pp
index adc0dfe..7c5ac1d 100644
--- a/modules/snapshot/manifests/dumps/templates.pp
+++ b/modules/snapshot/manifests/dumps/templates.pp
@@ -2,58 +2,59 @@
if ($enable) {
include snapshot::dumps::dirs
+ $templsdir = "${snapshot::dumps::dirs::dumpsdir}/templs"
- file { "${snapshot::dumps::dirs::dumpsdir}/templs/download-index.html":
+ file { "${templsdir}/download-index.html":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::dumpsdir}/templs/download-index.html",
+ path => "${templsdir}/download-index.html",
mode => '0644',
owner => 'root',
group => 'root',
source =>
'puppet:///modules/snapshot/dumps/templates/download-index.html',
}
- file { "${snapshot::dumps::dirs::dumpsdir}/templs/dvd.html":
+ file { "${templsdir}/dvd.html":
ensure => 'present',
- path => "${snapshot::dumps::dirs::dumpsdir}/templs/dvd.html",
+ path => "${templsdir}/dvd.html",
mode => '0644',
owner => 'root',
group => 'root',
source => 'puppet:///modules/snapshot/dumps/templates/dvd.html',
}
- file { "${snapshot::dumps::dirs::dumpsdir}/templs/errormail.txt":
+ file { "${templsdir}/errormail.txt":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::dumpsdir}/templs/errormail.txt",
+ path => "${templsdir}/errormail.txt",
mode => '0644',
owner => 'root',
group => 'root',
source =>
'puppet:///modules/snapshot/dumps/templates/errormail.txt',
}
- file { "${snapshot::dumps::dirs::dumpsdir}/templs/feed.xml":
+ file { "${templsdir}/feed.xml":
ensure => 'present',
- path => "${snapshot::dumps::dirs::dumpsdir}/templs/feed.xml",
+ path => "${templsdir}/templs/feed.xml",
mode => '0644',
owner => 'root',
group => 'root',
source => 'puppet:///modules/snapshot/dumps/templates/feed.xml',
}
- file { "${snapshot::dumps::dirs::dumpsdir}/templs/legal.html":
+ file { "${templsdir}/legal.html":
ensure => 'present',
- path => "${snapshot::dumps::dirs::dumpsdir}/templs/legal.html",
+ path => "${templsdir}/legal.html",
mode => '0644',
owner => 'root',
group => 'root',
source => 'puppet:///modules/snapshot/dumps/templates/legal.html',
}
- file { "${snapshot::dumps::dirs::dumpsdir}/templs/progress.html":
+ file { "${templsdir}/progress.html":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::dumpsdir}/templs/progress.html",
+ path => "${templsdir}/progress.html",
mode => '0644',
owner => 'root',
group => 'root',
source =>
'puppet:///modules/snapshot/dumps/templates/progress.html',
}
- file { "${snapshot::dumps::dirs::dumpsdir}/templs/report.html":
+ file { "${templsdir}/report.html":
ensure => 'present',
- path => "${snapshot::dumps::dirs::dumpsdir}/templs/report.html",
+ path => "${templsdir}/report.html",
mode => '0644',
owner => 'root',
group => 'root',
@@ -63,9 +64,9 @@
$warning = "The files in this directory are maintained by puppet!\n"
$location = "puppet:///modules/snapshot/dumps/templates\n"
- file { "${snapshot::dumps::dirs::dumpsdir}/templs/README":
+ file { "${templsdir}/README":
ensure => 'present',
- path => "${snapshot::dumps::dirs::dumpsdir}/templs/README",
+ path => "${templsdir}/README",
mode => '0644',
owner => 'root',
group => 'root',
diff --git a/modules/snapshot/manifests/mediaperprojectlists.pp
b/modules/snapshot/manifests/mediaperprojectlists.pp
index d22577a..ab52a9b 100644
--- a/modules/snapshot/manifests/mediaperprojectlists.pp
+++ b/modules/snapshot/manifests/mediaperprojectlists.pp
@@ -20,10 +20,11 @@
group => root,
content => template('snapshot/create-media-per-project-lists.sh.erb'),
}
+ $confsdir = "${snapshot::dumps::dirs::wikiqueriesdir}/confs"
- file { "${snapshot::dumps::dirs::wikiqueriesdir}/confs/wq.conf.media":
+ file { "${confsdir}/wq.conf.media":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::wikiqueriesdir}/confs/wq.conf.media",
+ path => "${confsdir}/wq.conf.media",
mode => '0644',
owner => $user,
group => root,
diff --git a/modules/snapshot/manifests/wikiqueryskip.pp
b/modules/snapshot/manifests/wikiqueryskip.pp
index 252d3d3..ca73a94 100644
--- a/modules/snapshot/manifests/wikiqueryskip.pp
+++ b/modules/snapshot/manifests/wikiqueryskip.pp
@@ -1,9 +1,9 @@
class snapshot::wikiqueryskip {
include snapshot::dumps::dirs
-
- file { "${snapshot::dumps::dirs::wikiqueriesdir}/dblists":
+ $dblistsdir = "${snapshot::dumps::dirs::wikiqueriesdir}/dblists"
+ file { $dblistsdir:
ensure => 'directory',
- path => "${snapshot::dumps::dirs::wikiqueriesdir}/dblists",
+ path => $dblistsdir,
mode => '0755',
owner => 'root',
group => 'root',
@@ -11,9 +11,9 @@
$skipdbs = ['labswiki','labtestwiki']
$skipdbs_dblist = join($skipdbs, "\n")
- file { "${snapshot::dumps::dirs::wikiqueriesdir}/dblists/skip.dblist":
+ file { "${dblistsdir}/dblists/skip.dblist":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::wikiqueriesdir}/dblists/skip.dblist",
+ path => "${dblistsdir}/dblists/skip.dblist",
mode => '0644',
owner => 'root',
group => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/280830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib617e602512e4d8749e168525331e22f3b5c4167
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
