ArielGlenn has submitted this change and it was merged.
Change subject: snapshots: fix up all variable refs to dump dirs in templates
......................................................................
snapshots: fix up all variable refs to dump dirs in templates
Change-Id: Ibc1027b69289793a621937a65544268c1ed313fa
---
M modules/snapshot/manifests/dumps/configs.pp
M modules/snapshot/manifests/dumps/dblists.pp
M modules/snapshot/manifests/dumps/dirs.pp
M modules/snapshot/templates/create-mediadir-list.sh.erb
M modules/snapshot/templates/dumpcentralauth.sh.erb
M modules/snapshot/templates/dumpcirrussearch.sh.erb
M modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
M modules/snapshot/templates/list-last-good-dumps.sh.erb
M modules/snapshot/templates/wikidatadumps-shared.sh.erb
M modules/snapshot/templates/wikidump.conf.erb
M modules/snapshot/templates/wq.conf.erb
M modules/snapshot/templates/wq.conf.media.erb
12 files changed, 72 insertions(+), 67 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/snapshot/manifests/dumps/configs.pp
b/modules/snapshot/manifests/dumps/configs.pp
index ebd58f7..17550bd 100644
--- a/modules/snapshot/manifests/dumps/configs.pp
+++ b/modules/snapshot/manifests/dumps/configs.pp
@@ -5,16 +5,18 @@
include snapshot::dumps::dirs
+ $dblistsdir = $snapshot::dumps::dirs::dblistsdir
+
$config = {
smallwikis => {
dblist =>
"${snapshot::dumps::dirs::apachedir}/dblists/all.dblist",
- skipdblist =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/skip.dblist",
+ skipdblist => "${dblistsdir}/skip.dblist",
keep => '12',
chunksEnabled => '0',
},
bigwikis => {
- dblist =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/bigwikis.dblist",
- skipdblist =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/skipnone.dblist",
+ dblist => "${dblistsdir}/bigwikis.dblist",
+ skipdblist => "${dblistsdir}/skipnone.dblist",
keep => '10',
chunksEnabled => '1',
recombineHistory => '0',
@@ -93,8 +95,8 @@
},
},
hugewikis => {
- dblist =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/hugewikis.dblist",
- skipdblist =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/skipnone.dblist",
+ dblist => "${dblistsdir}/hugewikis.dblist",
+ skipdblist => "${dblistsdir}/skipnone.dblist",
keep => '9',
chunksEnabled => '1',
recombineHistory => '0',
@@ -108,13 +110,13 @@
},
monitor => {
dblist =>
"${snapshot::dumps::dirs::apachedir}/dblists/all.dblist",
- skipdblist =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/skipmonitor.dblist",
+ skipdblist => "${dblistsdir}/skipmonitor.dblist",
keep => '30',
chunksEnabled => '0',
},
media => {
dblist =>
"${snapshot::dumps::dirs::apachedir}/dblists/all.dblist",
- skipdblist =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/globalusage.dblist",
+ skipdblist => "${dblistsdir}/globalusage.dblist",
keep => '30',
chunksEnabled => '0',
},
diff --git a/modules/snapshot/manifests/dumps/dblists.pp
b/modules/snapshot/manifests/dumps/dblists.pp
index 2ba8dc3..c8f3305 100644
--- a/modules/snapshot/manifests/dumps/dblists.pp
+++ b/modules/snapshot/manifests/dumps/dblists.pp
@@ -20,52 +20,54 @@
include snapshot::dumps::dirs
+ $dblistsdir = $snapshot::dumps::dirs::dblistsdir
+
if ($hugewikis_enable) {
# this host will run enwiki dumps
- file {
"${snapshot::dumps::dirs::dumpsdir}/dblists/hugewikis.dblist":
+ file { "${dblistsdir}/hugewikis.dblist":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/hugewikis.dblist",
+ path => "${dblistsdir}/hugewikis.dblist",
mode => '0644',
owner => 'root',
group => 'root',
content => "${hugewikis_dblist}\n",
}
}
- file { "${snapshot::dumps::dirs::dumpsdir}/dblists/bigwikis.dblist":
+ file { "${dblistsdir}/bigwikis.dblist":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/bigwikis.dblist",
+ path => "${dblistsdir}/bigwikis.dblist",
mode => '0644',
owner => 'root',
group => 'root',
content => "${bigwikis_dblist}\n",
}
- file { "${snapshot::dumps::dirs::dumpsdir}/dblists/skip.dblist":
+ file { "${dblistsdir}/skip.dblist":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/skip.dblist",
+ path => "${dblistsdir}/skip.dblist",
mode => '0644',
owner => 'root',
group => 'root',
content => "${skip_dblist}\n",
}
- file { "${snapshot::dumps::dirs::dumpsdir}/dblists/skipmonitor.dblist":
+ file { "${dblistsdir}/skipmonitor.dblist":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/skipmonitor.dblist",
+ path => "${dblistsdir}/skipmonitor.dblist",
mode => '0644',
owner => 'root',
group => 'root',
content => "${excludewikis_dblist}\n",
}
- file { "${snapshot::dumps::dirs::dumpsdir}/dblists/skipnone.dblist":
+ file { "${dblistsdir}/skipnone.dblist":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/skipnone.dblist",
+ path => "${dblistsdir}/skipnone.dblist",
mode => '0644',
owner => 'root',
group => 'root',
content => "${skipnone_dblist}\n",
}
- file { "${snapshot::dumps::dirs::dumpsdir}/dblists/globalusage.dblist":
+ file { "${dblistsdir}/globalusage.dblist":
ensure => 'present',
- path =>
"${snapshot::dumps::dirs::dumpsdir}/dblists/globalusage.dblist",
+ path => "${dblistsdir}/globalusage.dblist",
mode => '0644',
owner => 'root',
group => 'root',
@@ -75,9 +77,9 @@
$warning = "The files in this directory are maintained by puppet!\n"
$location = "puppet:///modules/snapshot/dumps/dblists.pp\n"
- file { "${snapshot::dumps::dirs::dumpsdir}/dblists/README":
+ file { "${dblistsdir}/README":
ensure => 'present',
- path => "${snapshot::dumps::dirs::dumpsdir}/dblists/README",
+ path => "${dblistsdir}/README",
mode => '0644',
owner => 'root',
group => 'root',
diff --git a/modules/snapshot/manifests/dumps/dirs.pp
b/modules/snapshot/manifests/dumps/dirs.pp
index cbef219..964a5f4 100644
--- a/modules/snapshot/manifests/dumps/dirs.pp
+++ b/modules/snapshot/manifests/dumps/dirs.pp
@@ -22,9 +22,10 @@
group => 'root',
}
- file { "${dumpsdir}/dblists":
+ $dblistsdir = "${dumpsdir}/dblists"
+ file { $dblistsdir:
ensure => 'directory',
- path => "${dumpsdir}/dblists",
+ path => $dblistsdir,
mode => '0755',
owner => 'root',
group => 'root',
diff --git a/modules/snapshot/templates/create-mediadir-list.sh.erb
b/modules/snapshot/templates/create-mediadir-list.sh.erb
index 4c98e60..e27569b 100755
--- a/modules/snapshot/templates/create-mediadir-list.sh.erb
+++ b/modules/snapshot/templates/create-mediadir-list.sh.erb
@@ -5,18 +5,18 @@
# puppet:///modules/snapshot/create-mediadir-list.sh.erb
#############################################################
-outputdir="<%= scope.lookupvar('snapshot::dirs::datadir')
-%>/public/other/imageinfo/"
+outputdir="<%= scope.lookupvar('snapshot::dumps::dirs::datadir')
-%>/public/other/imageinfo/"
outputfile="uploaddirs.txt"
DATE=`date +%Y%m%d`
# generate the new file
python /usr/local/bin/listwikiuploaddirs.py \
- --allwikis <%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/all.dblist \
- --closedwikis <%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/closed.dblist \
- --privatewikis <%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/private.dblist \
- --skipwikis <%= scope.lookupvar('snapshot::dirs::wikiqueriesdir')
-%>/dblists/skip.dblist \
+ --allwikis <%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/all.dblist \
+ --closedwikis <%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/closed.dblist \
+ --privatewikis <%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/private.dblist \
+ --skipwikis <%= scope.lookupvar('snapshot::dumps::dirs::wikiqueriesdir')
-%>/dblists/skip.dblist \
--wmfhack --multiversion \
- --scriptpath <%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/multiversion \
+ --scriptpath <%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/multiversion \
> "${outputdir}${outputfile}.${DATE}"
if [ $? -ne 0 ]; then
echo "Failed to generate list of media dirs, exiting early."
diff --git a/modules/snapshot/templates/dumpcentralauth.sh.erb
b/modules/snapshot/templates/dumpcentralauth.sh.erb
index e1100a1..114af23 100755
--- a/modules/snapshot/templates/dumpcentralauth.sh.erb
+++ b/modules/snapshot/templates/dumpcentralauth.sh.erb
@@ -5,12 +5,12 @@
echo
echo " --site codfw, eqiad, etc"
echo " --config path to configuration file for dump generation"
- echo " (default value: <%=
scope.lookupvar('snapshot::dirs::dumpsdir') -%>/confs/wikidump.conf"
+ echo " (default value: <%=
scope.lookupvar('snapshot::dumps::dirs::dumpsdir') -%>/confs/wikidump.conf"
echo " --dryrun don't run dump, show what would have been done"
exit 1
}
-configfile="<%= scope.lookupvar('snapshot::dirs::dumpsdir')
-%>/confs/wikidump.conf"
+configfile="<%= scope.lookupvar('snapshot::dumps::dirs::dumpsdir')
-%>/confs/wikidump.conf"
dryrun="false"
site=""
diff --git a/modules/snapshot/templates/dumpcirrussearch.sh.erb
b/modules/snapshot/templates/dumpcirrussearch.sh.erb
index faaa615..47ce5fb 100644
--- a/modules/snapshot/templates/dumpcirrussearch.sh.erb
+++ b/modules/snapshot/templates/dumpcirrussearch.sh.erb
@@ -7,11 +7,11 @@
echo "Usage: $0 [--config <pathtofile>] [--dryrun]"
echo
echo " --config path to configuration file for dump generation"
- echo " (default value: <%=
scope.lookupvar('snapshot::dirs::dumpsdir') -%>/confs/wikidump.conf"
+ echo " (default value: <%=
scope.lookupvar('snapshot::dumps::dirs::dumpsdir') -%>/confs/wikidump.conf"
echo " --dryrun don't run dump, show what would have been done"
exit 1
}
-configFile="<%= scope.lookupvar('snapshot::dirs::dumpsdir')
-%>/confs/wikidump.conf"
+configFile="<%= scope.lookupvar('snapshot::dumps::dirs::dumpsdir')
-%>/confs/wikidump.conf"
dryrun="false"
while [ $# -gt 0 ]; do
diff --git a/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
b/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
index 238a554..1eb832b 100644
--- a/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
+++ b/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
@@ -12,6 +12,6 @@
respawn
-chdir <%= scope.lookupvar('snapshot::dirs::dumpsdir') -%>
+chdir <%= scope.lookupvar('snapshot::dumps::dirs::scriptsdir') -%>
-exec /bin/bash <%= scope.lookupvar('snapshot::dirs::dumpsdir') -%>/monitor
--configfile confs/wikidump.conf.monitor
+exec /bin/bash <%= scope.lookupvar('snapshot::dumps::dirs::scriptsdir')
-%>/monitor --configfile confs/wikidump.conf.monitor
diff --git a/modules/snapshot/templates/list-last-good-dumps.sh.erb
b/modules/snapshot/templates/list-last-good-dumps.sh.erb
index 527026d..4263ec8 100644
--- a/modules/snapshot/templates/list-last-good-dumps.sh.erb
+++ b/modules/snapshot/templates/list-last-good-dumps.sh.erb
@@ -5,5 +5,5 @@
#############################################################
# generate lists of most recent completed successful dumps for rsync (dirs,
files)
-python /usr/local/bin/list-last-n-good-dumps.py --dumpsnumber 1,2,3,4,5
--dirlisting 'rsync-dirlist-last-%s-good.txt' --configfile <%=
scope.lookupvar('snapshot::dirs::dumpsdir') -%>/confs/wikidump.conf.monitor
--rsynclists --relpath --outputdir <%=
scope.lookupvar('snapshot::dirs::datadir') -%>/public/
-python /usr/local/bin/list-last-n-good-dumps.py --dumpsnumber 1,2,3,4,5
--filelisting 'rsync-filelist-last-%s-good.txt' --configfile <%=
scope.lookupvar('snapshot::dirs::dumpsdir') -%>/confs/wikidump.conf.monitor
--rsynclists --relpath --outputdir <%=
scope.lookupvar('snapshot::dirs::datadir') -%>/public/ --toplevel
+python /usr/local/bin/list-last-n-good-dumps.py --dumpsnumber 1,2,3,4,5
--dirlisting 'rsync-dirlist-last-%s-good.txt' --configfile <%=
scope.lookupvar('snapshot::dumps::dirs::dumpsdir')
-%>/confs/wikidump.conf.monitor --rsynclists --relpath --outputdir <%=
scope.lookupvar('snapshot::dumps::dirs::datadir') -%>/public/
+python /usr/local/bin/list-last-n-good-dumps.py --dumpsnumber 1,2,3,4,5
--filelisting 'rsync-filelist-last-%s-good.txt' --configfile <%=
scope.lookupvar('snapshot::dumps::dirs::dumpsdir')
-%>/confs/wikidump.conf.monitor --rsynclists --relpath --outputdir <%=
scope.lookupvar('snapshot::dumps::dirs::datadir') -%>/public/ --toplevel
diff --git a/modules/snapshot/templates/wikidatadumps-shared.sh.erb
b/modules/snapshot/templates/wikidatadumps-shared.sh.erb
index 950e439..27c6c1f 100644
--- a/modules/snapshot/templates/wikidatadumps-shared.sh.erb
+++ b/modules/snapshot/templates/wikidatadumps-shared.sh.erb
@@ -4,7 +4,7 @@
#
# Marius Hoch < [email protected] >
-configfile="<%= scope.lookupvar('snapshot::dirs::dumpsdir')
-%>/confs/wikidump.conf"
+configfile="<%= scope.lookupvar('snapshot::dumps::dirs::dumpsdir')
-%>/confs/wikidump.conf"
today=`date +'%Y%m%d'`
daysToKeep=70
diff --git a/modules/snapshot/templates/wikidump.conf.erb
b/modules/snapshot/templates/wikidump.conf.erb
index b1e61c4..757efa5 100644
--- a/modules/snapshot/templates/wikidump.conf.erb
+++ b/modules/snapshot/templates/wikidump.conf.erb
@@ -5,16 +5,16 @@
[wiki]
dblist=<%= @config[@configtype]['dblist'] %>
-privatelist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/private.dblist
-flaggedrevslist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/flaggedrevs.dblist
-closedlist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/closed.dblist
-biglist=<%= scope.lookupvar('snapshot::dirs::apachedir') -%>/dblists/big.dblist
+privatelist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/private.dblist
+flaggedrevslist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/flaggedrevs.dblist
+closedlist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/closed.dblist
+biglist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/big.dblist
skipdblist=<%= @config[@configtype]['skipdblist'] %>
-wikidatalist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/wikidata.dblist
-globalusagelist=<%= scope.lookupvar('snapshot::dirs::dumpsdir')
-%>/dblists/globalusage.dblist
-wikidataclientlist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/wikidataclient.dblist
-nonflowlist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/nonflow.dblist
-dir=<%= scope.lookupvar('snapshot::dirs::apachedir') %>
+wikidatalist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/wikidata.dblist
+globalusagelist=<%=
scope.lookupvar('snapshot::dumps::dirs::dumpsdir::dblistsdir')
-%>/globalusage.dblist
+wikidataclientlist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/wikidataclient.dblist
+nonflowlist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/nonflow.dblist
+dir=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir') %>
adminsettings=private/PrivateSettings.php
forcenormal=0
@@ -22,10 +22,10 @@
#halt=1
[output]
-public=<%= scope.lookupvar('snapshot::dirs::datadir') -%>/public
-private=<%= scope.lookupvar('snapshot::dirs::datadir') -%>/private
-temp=<%= scope.lookupvar('snapshot::dirs::datadir') -%>/temp
-templatedir=<%= scope.lookupvar('snapshot::dirs::dumpsdir') -%>/templs
+public=<%= scope.lookupvar('snapshot::dumps::dirs::datadir') -%>/public
+private=<%= scope.lookupvar('snapshot::dumps::dirs::datadir') -%>/private
+temp=<%= scope.lookupvar('snapshot::dumps::dirs::datadir') -%>/temp
+templatedir=<%= scope.lookupvar('snapshot::dumps::dirs::dumpsdir') -%>/templs
index=backup-index.html
webroot=http://download.wikimedia.org
fileperms=0644
diff --git a/modules/snapshot/templates/wq.conf.erb
b/modules/snapshot/templates/wq.conf.erb
index 30e34f3..3737c07 100644
--- a/modules/snapshot/templates/wq.conf.erb
+++ b/modules/snapshot/templates/wq.conf.erb
@@ -3,16 +3,16 @@
# puppet:///modules/snapshot/wq.conf.erb
#############################################################
[wiki]
-mediawiki=<%= scope.lookupvar('snapshot::dirs::apachedir') %>
-allwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/all.dblist
-privatewikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/private.dblist
-closedwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/closed.dblist
-skipwikislist=<%= scope.lookupvar('snapshot::dirs::wikiqueriesdir')
-%>/dblists/skip.dblist
+mediawiki=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir') %>
+allwikislist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/all.dblist
+privatewikislist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/private.dblist
+closedwikislist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/closed.dblist
+skipwikislist=<%= scope.lookupvar('snapshot::dumps::dirs::wikiqueriesdir')
-%>/dblists/skip.dblist
adminsettings=private/PrivateSettings.php
[output]
-wikiqueriesdir=<%= scope.lookupvar('snapshot::dirs::datadir')
-%>/public/other/pagetitles
-temp=<%= scope.lookupvar('snapshot::dirs::datadir') -%>/temp
+wikiqueriesdir=<%= scope.lookupvar('snapshot::dumps::dirs::datadir')
-%>/public/other/pagetitles
+temp=<%= scope.lookupvar('snapshot::dumps::dirs::datadir') -%>/temp
fileperms=0644
[database]
@@ -22,4 +22,4 @@
mysql=/usr/bin/mysql
gzip=/bin/gzip
bzip2=/bin/bzip2
-multiversion=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/multiversion/MWScript.php
+multiversion=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/multiversion/MWScript.php
diff --git a/modules/snapshot/templates/wq.conf.media.erb
b/modules/snapshot/templates/wq.conf.media.erb
index 5b54c6d..1ae2878 100644
--- a/modules/snapshot/templates/wq.conf.media.erb
+++ b/modules/snapshot/templates/wq.conf.media.erb
@@ -3,16 +3,16 @@
# puppet:///modules/snapshot/wq.conf.media.erb
#############################################################
[wiki]
-mediawiki=<%= scope.lookupvar('snapshot::dirs::apachedir') %>
-allwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/all.dblist
-privatewikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/private.dblist
-closedwikislist=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/dblists/closed.dblist
+mediawiki=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir') %>
+allwikislist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/all.dblist
+privatewikislist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/private.dblist
+closedwikislist=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/dblists/closed.dblist
adminsettings=private/PrivateSettings.php
-skipwikislist=<%= scope.lookupvar('snapshot::dirs::wikiqueriesdir')
-%>/dblists/skip.dblist
+skipwikislist=<%= scope.lookupvar('snapshot::dumps::dirs::wikiqueriesdir')
-%>/dblists/skip.dblist
[output]
-wikiqueriesdir=<%= scope.lookupvar('snapshot::dirs::datadir')
-%>/public/other/imageinfo
-temp=<%= scope.lookupvar('snapshot::dirs::datadir') -%>/temp
+wikiqueriesdir=<%= scope.lookupvar('snapshot::dumps::dirs::datadir')
-%>/public/other/imageinfo
+temp=<%= scope.lookupvar('snapshot::dumps::dirs::datadir') -%>/temp
fileperms=0644
[database]
@@ -22,4 +22,4 @@
mysql=/usr/bin/mysql
gzip=/bin/gzip
bzip2=/bin/bzip2
-multiversion=<%= scope.lookupvar('snapshot::dirs::apachedir')
-%>/multiversion/MWScript.php
+multiversion=<%= scope.lookupvar('snapshot::dumps::dirs::apachedir')
-%>/multiversion/MWScript.php
--
To view, visit https://gerrit.wikimedia.org/r/280769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc1027b69289793a621937a65544268c1ed313fa
Gerrit-PatchSet: 8
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
