ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/120801
Change subject: add config file for media list generation on snapshots ...................................................................... add config file for media list generation on snapshots Change-Id: I573c4d95e3d8b897342729fa373701ff8788a229 --- M modules/snapshot/manifests/mediaperprojectlists.pp A modules/snapshot/templates/wq.conf.media.erb 2 files changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/01/120801/1 diff --git a/modules/snapshot/manifests/mediaperprojectlists.pp b/modules/snapshot/manifests/mediaperprojectlists.pp index ba88f1c..0d7b8b5 100644 --- a/modules/snapshot/manifests/mediaperprojectlists.pp +++ b/modules/snapshot/manifests/mediaperprojectlists.pp @@ -24,6 +24,14 @@ group => root, content => template('snapshot/create-media-per-project-lists.sh.erb'), } + file { "${snapshot::dirs::wikiqueriesdir}/confs/wq.conf.media": + ensure => 'present', + path => "${snapshot::dirs::wikiqueriesdir}/confs/wq.conf.media", + mode => '0644', + owner => $user, + group => root, + content => template('snapshot/wq.conf.media.erb'), + } cron { 'list-media-per-project': ensure => $ensure, diff --git a/modules/snapshot/templates/wq.conf.media.erb b/modules/snapshot/templates/wq.conf.media.erb new file mode 100644 index 0000000..b113ac4 --- /dev/null +++ b/modules/snapshot/templates/wq.conf.media.erb @@ -0,0 +1,24 @@ +############################################################# +# This file is maintained by puppet! +# puppet:///modules/snapshot/wq.conf.media.erb +############################################################# +[wiki] +mediawiki=<%= scope.lookupvar('snapshot::dirs::apachedir') %> +allwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') -%>/all.dblist +privatewikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') -%>/private.dblist +closedwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir') -%>/closed.dblist +adminsettings=wmf-config/AdminSettings.php + +[output] +wikiqueriesdir=<%= scope.lookupvar('snapshot::dirs::datadir') -%>/public/other/imageinfo +temp=<%= scope.lookupvar('snapshot::dirs::datadir') -%>/temp +fileperms=0644 + +[database] + +[tools] +php=/usr/bin/php +mysql=/usr/bin/mysql +gzip=/bin/gzip +bzip2=/bin/bzip2 +multiversion=<%= scope.lookupvar('snapshot::dirs::apachedir') -%>/multiversion/MWScript.php -- To view, visit https://gerrit.wikimedia.org/r/120801 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I573c4d95e3d8b897342729fa373701ff8788a229 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