ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/276829

Change subject: dumps: move pagetitles production from wikiquery script to 
onallwikis
......................................................................

dumps: move pagetitles production from wikiquery script to onallwikis

Change-Id: I2d8fb51848027984ebbd5eae93a9858f2bbfbd9d
---
M modules/snapshot/manifests/dumps/pagetitles.pp
1 file changed, 2 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/276829/1

diff --git a/modules/snapshot/manifests/dumps/pagetitles.pp 
b/modules/snapshot/manifests/dumps/pagetitles.pp
index e599131..4923cb5 100644
--- a/modules/snapshot/manifests/dumps/pagetitles.pp
+++ b/modules/snapshot/manifests/dumps/pagetitles.pp
@@ -28,28 +28,11 @@
         group  => root,
     }
 
-    file { "${snapshot::dirs::wikiqueriesdir}/confs":
-        ensure => 'directory',
-        path   => "${snapshot::dirs::wikiqueriesdir}/confs",
-        mode   => '0755',
-        owner  => $user,
-        group  => root,
-    }
-
-    file { "${snapshot::dirs::wikiqueriesdir}/confs/wq.conf":
-        ensure  => 'present',
-        path    => "${snapshot::dirs::wikiqueriesdir}/confs/wq.conf",
-        mode    => '0644',
-        owner   => $user,
-        group   => root,
-        content => template('snapshot/wq.conf.erb'),
-    }
-
     cron { 'pagetitles-ns0':
         ensure      => $ensure,
         environment => '[email protected]',
         user        => $user,
-        command     => "cd ${snapshot::dirs::wikiqueriesdir}; python 
wikiqueries.py --configfile confs/wq.conf  --filenameformat 
'{w}-{d}-all-titles-in-ns-0.gz' --outdir 
'${snapshot::dirs::datadir}/public/other/pagetitles/{d}' --query 'select 
page_title from page where page_namespace=0;'",
+        command     => "cd ${snapshot::dirs::dumpsdir}; python onallwikis.py 
--configfile confs/wikidump.conf  --filenameformat 
'{w}-{d}-all-titles-in-ns-0.gz' --outdir 
'${snapshot::dirs::datadir}/public/other/pagetitles/{d}' --query \"'select 
page_title from page where page_namespace=0;'\"",
         minute      => '10',
         hour        => '8',
         require     => 
File["${snapshot::dirs::datadir}/public/other/pagetitles"],
@@ -59,7 +42,7 @@
         ensure      => $ensure,
         environment => '[email protected]',
         user        => $user,
-        command     => "cd ${snapshot::dirs::wikiqueriesdir}; python 
wikiqueries.py --configfile confs/wq.conf  --filenameformat 
'{w}-{d}-all-media-titles.gz' --outdir 
'${snapshot::dirs::datadir}/public/other/mediatitles/{d}' --query 'select 
page_title from page where page_namespace=6;'",
+        command     => "cd ${snapshot::dirs::dumpsdir}; python onallwikis.py 
--configfile confs/wikidump.conf  --filenameformat 
'{w}-{d}-all-media-titles.gz' --outdir 
'${snapshot::dirs::datadir}/public/other/mediatitles/{d}' --query \"'select 
page_title from page where page_namespace=6;'\"",
         minute      => '50',
         hour        => '8',
         require     => 
File["${snapshot::dirs::datadir}/public/other/mediatitles"],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d8fb51848027984ebbd5eae93a9858f2bbfbd9d
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

Reply via email to