ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333572 )
Change subject: in snapshot manifests fix up more template to shell script
conversions
......................................................................
in snapshot manifests fix up more template to shell script conversions
missed these earlier in bb4f6105d5ef78cd0575e5b145b5405ecadc6ab5
Change-Id: Ic45a7bd2d7aa464011c900b71779076aa876f9c3
---
M modules/snapshot/files/cron/create-media-per-project-lists.sh
M modules/snapshot/files/cron/dumpcentralauth.sh
M modules/snapshot/files/cron/wikidatadumps-shared.sh
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/snapshot/files/cron/create-media-per-project-lists.sh
b/modules/snapshot/files/cron/create-media-per-project-lists.sh
index d464d29..c9342c1 100755
--- a/modules/snapshot/files/cron/create-media-per-project-lists.sh
+++ b/modules/snapshot/files/cron/create-media-per-project-lists.sh
@@ -24,7 +24,7 @@
fi
# determine which wiki has the global image links table and set as base wiki
for the run
-globalusagelist="<%= scope.lookupvar('snapshot::dumps::dirs::dblistsdir')
-%>/globalusage.dblist"
+globalusagelist="${dblistsdir}/globalusage.dblist"
basewiki=`cat "$globalusagelist"`
python "${repodir}/onallwikis.py" --outdir "$outputdir" \
diff --git a/modules/snapshot/files/cron/dumpcentralauth.sh
b/modules/snapshot/files/cron/dumpcentralauth.sh
index c68f633..e3c6923 100755
--- a/modules/snapshot/files/cron/dumpcentralauth.sh
+++ b/modules/snapshot/files/cron/dumpcentralauth.sh
@@ -11,7 +11,7 @@
echo
echo " --site codfw, eqiad, etc"
echo " --config path to configuration file for dump generation"
- echo " (default value: <%=
scope.lookupvar('snapshot::dumps::dirs::confsdir') -%>/wikidump.conf"
+ echo " (default value: ${confsdir}/wikidump.conf"
echo " --dryrun don't run dump, show what would have been done"
exit 1
}
diff --git a/modules/snapshot/files/cron/wikidatadumps-shared.sh
b/modules/snapshot/files/cron/wikidatadumps-shared.sh
index bcb65b7..7aa38e5 100644
--- a/modules/snapshot/files/cron/wikidatadumps-shared.sh
+++ b/modules/snapshot/files/cron/wikidatadumps-shared.sh
@@ -9,7 +9,7 @@
# Marius Hoch < h...@online.de >
source /usr/local/etc/set_dump_dirs.sh
-configfile="${confdir}/wikidump.conf"
+configfile="${confsdir}/wikidump.conf"
today=`date +'%Y%m%d'`
daysToKeep=70
--
To view, visit https://gerrit.wikimedia.org/r/333572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic45a7bd2d7aa464011c900b71779076aa876f9c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
