ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398106 )
Change subject: apachedir is available to dumps cron jobs via a bash script,
use it
......................................................................
apachedir is available to dumps cron jobs via a bash script, use it
Don't do the extra fork out to get and verify the path from the
dumps config file
Change-Id: I00dd50bfb6a2d7d6b2f11ec30ac1f951c874a1b2
---
M modules/snapshot/files/cron/dump-global-blocks.sh
M modules/snapshot/files/cron/dumpcategoriesrdf.sh
M modules/snapshot/files/cron/dumpcirrussearch.sh
M modules/snapshot/files/cron/dumpcontentxlation.sh
M modules/snapshot/files/cron/wikidatadumps-shared.sh
5 files changed, 13 insertions(+), 18 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/snapshot/files/cron/dump-global-blocks.sh
b/modules/snapshot/files/cron/dump-global-blocks.sh
index 4f5416a..c3d2baf 100644
--- a/modules/snapshot/files/cron/dump-global-blocks.sh
+++ b/modules/snapshot/files/cron/dump-global-blocks.sh
@@ -97,14 +97,13 @@
fi
done
-args="wiki:dir;tools:gzip,mysqldump"
+args="tools:gzip,mysqldump"
results=`python "${repodir}/getconfigvals.py" --configfile "$configfile"
--args "$args"`
-apachedir=`getsetting "$results" "wiki" "dir"` || exit 1
gzip=`getsetting "$results" "tools" "gzip"` || exit 1
mysqldump=`getsetting "$results" "tools" "mysqldump"` || exit 1
-for settingname in "apachedir" "gzip" "mysqldump"; do
+for settingname in "gzip" "mysqldump"; do
checkval "$settingname" "${!settingname}"
done
diff --git a/modules/snapshot/files/cron/dumpcategoriesrdf.sh
b/modules/snapshot/files/cron/dumpcategoriesrdf.sh
index d55a692..898d088 100755
--- a/modules/snapshot/files/cron/dumpcategoriesrdf.sh
+++ b/modules/snapshot/files/cron/dumpcategoriesrdf.sh
@@ -52,14 +52,13 @@
exit 1
fi
-args="wiki:dir,privatelist;tools:gzip"
+args="wiki:privatelist;tools:gzip"
results=`python "${repodir}/getconfigvals.py" --configfile "$configFile"
--args "$args"`
-deployDir=`getsetting "$results" "wiki" "dir"` || exit 1
privateList=`getsetting "$results" "wiki" "privatelist"` || exit 1
gzip=`getsetting "$results" "tools" "gzip"` || exit 1
-for settingname in "deployDir" "gzip" "privateList"; do
+for settingname in "gzip" "privateList"; do
checkval "$settingname" "${!settingname}"
done
@@ -67,7 +66,7 @@
targetDirBase="${cronsdir}/categoriesrdf"
targetDir="${targetDirBase}/${today}"
timestampsDir="${targetDirBase}/lastdump"
-multiVersionScript="${deployDir}/multiversion/MWScript.php"
+multiVersionScript="${apachedir}/multiversion/MWScript.php"
# create todays folder
if [ "$dryrun" == "true" ]; then
diff --git a/modules/snapshot/files/cron/dumpcirrussearch.sh
b/modules/snapshot/files/cron/dumpcirrussearch.sh
index 9a7eeb6..9731e23 100644
--- a/modules/snapshot/files/cron/dumpcirrussearch.sh
+++ b/modules/snapshot/files/cron/dumpcirrussearch.sh
@@ -40,22 +40,21 @@
exit 1
fi
-args="wiki:dir,dblist,privatelist;tools:gzip"
+args="wiki:dblist,privatelist;tools:gzip"
results=`python "${repodir}/getconfigvals.py" --configfile "$configFile"
--args "$args"`
-deployDir=`getsetting "$results" "wiki" "dir"` || exit 1
allList=`getsetting "$results" "wiki" "dblist"` || exit 1
privateList=`getsetting "$results" "wiki" "privatelist"` || exit 1
gzip=`getsetting "$results" "tools" "gzip"` || exit 1
-for settingname in "deployDir" "allList" "privateList" "gzip"; do
+for settingname in "allList" "privateList" "gzip"; do
checkval "$settingname" "${!settingname}"
done
today=$(date +'%Y%m%d')
targetDirBase="${cronsdir}/cirrussearch"
targetDir="$targetDirBase/$today"
-multiVersionScript="$deployDir/multiversion/MWScript.php"
+multiVersionScript="${apachedir}/multiversion/MWScript.php"
# create todays folder
if [ "$dryrun" == "true" ]; then
diff --git a/modules/snapshot/files/cron/dumpcontentxlation.sh
b/modules/snapshot/files/cron/dumpcontentxlation.sh
index c580a7e..13191bf 100644
--- a/modules/snapshot/files/cron/dumpcontentxlation.sh
+++ b/modules/snapshot/files/cron/dumpcontentxlation.sh
@@ -59,13 +59,12 @@
# Get config settings
#####################
-args="wiki:dir;tools:php"
+args="tools:php"
results=`python "${repodir}/getconfigvals.py" --configfile "$configfile"
--args "$args"`
-apachedir=`getsetting "$results" "wiki" "dir"`
php=`getsetting "$results" "tools" "php"`
-for settingname in "apachedir" "php"; do
+for settingname in "php"; do
checkval "$settingname" "${!settingname}"
done
diff --git a/modules/snapshot/files/cron/wikidatadumps-shared.sh
b/modules/snapshot/files/cron/wikidatadumps-shared.sh
index 68d9b33..1dac803 100644
--- a/modules/snapshot/files/cron/wikidatadumps-shared.sh
+++ b/modules/snapshot/files/cron/wikidatadumps-shared.sh
@@ -14,20 +14,19 @@
today=`date +'%Y%m%d'`
daysToKeep=70
-args="wiki:dir;output:temp"
+args="output:temp"
results=`python "${repodir}/getconfigvals.py" --configfile "$configfile"
--args "$args"`
-apacheDir=`getsetting "$results" "wiki" "dir"` || exit 1
tempDir=`getsetting "$results" "output" "temp"` || exit 1
-for settingname in "apacheDir" "tempDir"; do
+for settingname in "tempDir"; do
checkval "$settingname" "${!settingname}"
done
targetDirBase=${cronsdir}/wikibase/wikidatawiki
targetDir=$targetDirBase/$today
-multiversionscript="${apacheDir}/multiversion/MWScript.php"
+multiversionscript="${apachedir}/multiversion/MWScript.php"
# Create the dir for the day: This may or may not already exist, we don't care
mkdir -p $targetDir
--
To view, visit https://gerrit.wikimedia.org/r/398106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00dd50bfb6a2d7d6b2f11ec30ac1f951c874a1b2
Gerrit-PatchSet: 2
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
