ArielGlenn has submitted this change and it was merged.
Change subject: move addschanges dumps to snapshot1007
......................................................................
move addschanges dumps to snapshot1007
These dumps become just one more misc cron job included in
the cronrunner role. Cruft like the 'enable' parameter gets
removed, scripts, templates and conf files are run out of the
same directory as the regular dumps.
Bug: T141282
Change-Id: I109583619dc3f6dfaa9ac0aa86360adfb26f9f40
---
M modules/role/manifests/snapshot/cron/primary.pp
M modules/role/manifests/snapshot/cron/secondary.pp
M modules/role/manifests/snapshot/cronjobs.pp
M modules/snapshot/manifests/addschanges.pp
D modules/snapshot/manifests/addschanges/config.pp
D modules/snapshot/manifests/addschanges/templates.pp
M modules/snapshot/manifests/dumps/dirs.pp
M modules/snapshot/templates/addschanges.conf.erb
8 files changed, 23 insertions(+), 115 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/snapshot/cron/primary.pp
b/modules/role/manifests/snapshot/cron/primary.pp
index a450851..4ad67d0 100644
--- a/modules/role/manifests/snapshot/cron/primary.pp
+++ b/modules/role/manifests/snapshot/cron/primary.pp
@@ -1,9 +1,5 @@
class role::snapshot::cron::primary {
include role::snapshot::common
- class { 'snapshot::addschanges':
- enable => true,
- user => 'datasets',
- }
}
diff --git a/modules/role/manifests/snapshot/cron/secondary.pp
b/modules/role/manifests/snapshot/cron/secondary.pp
index cbb28ac..6c82312 100644
--- a/modules/role/manifests/snapshot/cron/secondary.pp
+++ b/modules/role/manifests/snapshot/cron/secondary.pp
@@ -1,13 +1,5 @@
class role::snapshot::cron::secondary {
include role::snapshot::common
- class { 'snapshot::addschanges':
- enable => false,
- user => 'datasets',
- }
- class { 'snapshot::cron::mediadirlists':
- enable => false,
- user => 'datasets',
- }
}
diff --git a/modules/role/manifests/snapshot/cronjobs.pp
b/modules/role/manifests/snapshot/cronjobs.pp
index 0d752d9..68c5583 100644
--- a/modules/role/manifests/snapshot/cronjobs.pp
+++ b/modules/role/manifests/snapshot/cronjobs.pp
@@ -7,4 +7,5 @@
class { '::snapshot::cron::dumplists': user => 'datasets' }
class { '::snapshot::cron::wikidatadumps::json': user => 'datasets' }
class { '::snapshot::cron::wikidatadumps::ttl': user => 'datasets' }
+ class { '::snapshot::addschanges': user => 'datasets' }
}
diff --git a/modules/snapshot/manifests/addschanges.pp
b/modules/snapshot/manifests/addschanges.pp
index bcef8de..8920d24 100644
--- a/modules/snapshot/manifests/addschanges.pp
+++ b/modules/snapshot/manifests/addschanges.pp
@@ -1,28 +1,36 @@
class snapshot::addschanges(
- $enable=true,
$user=undef,
) {
include snapshot::dumps::dirs
- if ($enable) {
- $ensure = 'present'
- }
- else {
- $ensure = 'absent'
- }
+ $repodir = $snapshot::dumps::dirs::repodir
+ $confsdir = $snapshot::dumps::dirs::confsdir
+ $apachedir = $snapshot::dumps::dirs::apachedir
+ $dblistsdir = $snapshot::dumps::dirs::dblistsdir
+ $templsdir = "${snapshot::dumps::dirs::dumpsdir}/templs"
- class { 'snapshot::addschanges::config':
- enable => $enable,
+ file { "${confsdir}/addschanges.conf":
+ ensure => 'present',
+ path => "${confsdir}/addschanges.conf",
+ mode => '0755',
+ owner => 'root',
+ group => 'root',
+ content => template('snapshot/addschanges.conf.erb'),
}
- class { 'snapshot::addschanges::templates':
- enable => $enable,
+ file { "${templsdir}/incrs-index.html":
+ ensure => 'present',
+ path => "${templsdir}/incrs-index.html",
+ mode => '0644',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///modules/snapshot/addschanges/incrs-index.html',
}
cron { 'adds-changes':
- ensure => $ensure,
+ ensure => 'present',
environment => '[email protected]',
user => $user,
- command => "python
${snapshot::dumps::dirs::addschangesdir}/generateincrementals.py --configfile
${snapshot::dumps::dirs::addschangesdir}/confs/addschanges.conf",
+ command => "python ${repodir}/generateincrementals.py --configfile
${confsdir}/addschanges.conf",
minute => '50',
hour => '23',
}
diff --git a/modules/snapshot/manifests/addschanges/config.pp
b/modules/snapshot/manifests/addschanges/config.pp
deleted file mode 100644
index aa1eccc..0000000
--- a/modules/snapshot/manifests/addschanges/config.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-class snapshot::addschanges::config(
- $enable = true,
-) {
-
- include snapshot::dumps::dirs
-
- $apachedir = $snapshot::dumps::dirs::apachedir
- $confsdir = "${snapshot::dumps::dirs::addschangesdir}/confs"
- $dblistsdir = "${snapshot::dumps::dirs::addschangesdir}/dblists"
-
- if ($enable) {
- file { $confsdir:
- ensure => 'directory',
- path => $confsdir,
- mode => '0755',
- owner => 'root',
- group => 'root',
- }
- file { "${confsdir}/addschanges.conf":
- ensure => 'present',
- path => "${confsdir}/addschanges.conf",
- mode => '0755',
- owner => 'root',
- group => 'root',
- content => template('snapshot/addschanges.conf.erb'),
- }
- file { $dblistsdir:
- ensure => 'directory',
- path => $dblistsdir,
- mode => '0755',
- owner => 'root',
- group => 'root',
- }
- $skipdbs = ['labswiki','labtestwiki']
- $skipdbs_dblist = join($skipdbs, "\n")
- file { "${dblistsdir}/skip.dblist":
- ensure => 'present',
- path => "${dblistsdir}/skip.dblist",
- mode => '0755',
- owner => 'root',
- group => 'root',
- content => "${skipdbs_dblist}\n",
- }
- }
-}
diff --git a/modules/snapshot/manifests/addschanges/templates.pp
b/modules/snapshot/manifests/addschanges/templates.pp
deleted file mode 100644
index a11769a..0000000
--- a/modules/snapshot/manifests/addschanges/templates.pp
+++ /dev/null
@@ -1,34 +0,0 @@
-class snapshot::addschanges::templates($enable=true) {
- if ($enable) {
-
- include snapshot::dumps::dirs
- $templsdir = "${snapshot::dumps::dirs::addschangesdir}/templs"
-
- file { $templsdir:
- ensure => 'directory',
- path => $templsdir,
- mode => '0755',
- owner => 'root',
- group => 'root',
- }
- file { "${templsdir}/incrs-index.html":
- ensure => 'present',
- path => "${templsdir}/incrs-index.html",
- mode => '0644',
- owner => 'root',
- group => 'root',
- source =>
'puppet:///modules/snapshot/addschanges/incrs-index.html',
- }
- $warning = "The files in this directory are maintained by puppet!\n"
- $location = "puppet:///modules/snapshot/dumps/addschanges/templates\n"
-
- file { "${templsdir}/README":
- ensure => 'present',
- path => "${templsdir}/README",
- mode => '0644',
- owner => 'root',
- group => 'root',
- content => "${warning}${location}",
- }
- }
-}
diff --git a/modules/snapshot/manifests/dumps/dirs.pp
b/modules/snapshot/manifests/dumps/dirs.pp
index d22f47c..96080cb 100644
--- a/modules/snapshot/manifests/dumps/dirs.pp
+++ b/modules/snapshot/manifests/dumps/dirs.pp
@@ -56,16 +56,6 @@
group => 'root',
}
- $addschangesdir = '/srv/addschanges'
-
- file { $addschangesdir:
- ensure => 'directory',
- path => $addschangesdir,
- mode => '0644',
- owner => 'root',
- group => 'root',
- }
-
$scriptsdir = '/srv/dumps'
file { $scriptsdir:
ensure => 'directory',
diff --git a/modules/snapshot/templates/addschanges.conf.erb
b/modules/snapshot/templates/addschanges.conf.erb
index d797740..d4e9884 100644
--- a/modules/snapshot/templates/addschanges.conf.erb
+++ b/modules/snapshot/templates/addschanges.conf.erb
@@ -10,7 +10,7 @@
allwikislist=<%= @apachedir -%>/dblists/all.dblist
privatewikislist=<%= @apachedir -%>/dblists/private.dblist
closedwikislist=<%= @apachedir -%>/dblists/closed.dblist
-skipwikislist=<%= scope.lookupvar('snapshot::dumps::dirs::addschangesdir')
-%>/dblists/skip.dblist
+skipwikislist=<%= scope.lookupvar('snapshot::dumps::dirs::dblistsdir')
-%>/skip.dblist
adminsettings=private/PrivateSettings.php
[output]
--
To view, visit https://gerrit.wikimedia.org/r/301096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I109583619dc3f6dfaa9ac0aa86360adfb26f9f40
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
