Ori.livneh has submitted this change and it was merged.
Change subject: Fix-up for I2508a0cce: correct path to config file
......................................................................
Fix-up for I2508a0cce: correct path to config file
Change-Id: I542114e9c5c2b2097d16f088a4ace37ede8e537e
---
M modules/mediawiki/files/jobrunner.conf
M modules/mediawiki/files/jobrunner.default
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/files/jobrunner.conf
b/modules/mediawiki/files/jobrunner.conf
index d2e3e44..056b79a 100644
--- a/modules/mediawiki/files/jobrunner.conf
+++ b/modules/mediawiki/files/jobrunner.conf
@@ -12,7 +12,7 @@
. /etc/default/jobrunner
mkdir -p -m0755 $(dirname
"${JOBRUNNER_LOGFILE:=/var/log/mediawiki/jobrunner.log}")
[ ! -r "${JOBRUNNER_CONFIG:=/etc/jobrunner.conf}" ] && { stop; exit 1; }
- php -r "exit( !@is_array( json_decode( '$JOBRUNNER_CONFIG' ) ) );"
>/dev/null 2>&1
+ php -r "exit( !@is_array( json_decode( file_get_contents(
'$JOBRUNNER_CONFIG' ) ) ) );" >/dev/null 2>&1
[ $? -eq 0 ] || { stop; exit 1; }
end script
@@ -21,7 +21,7 @@
exec start-stop-daemon --quiet --start --pidfile
"${JOBRUNNER_PID:-/var/run/jobrunner/pid}" \
--chuid "${JOBRUNNER_USER:-nobody}:${JOBRUNNER_GROUP:-nogroup}"
--make-pidfile \
--exec /usr/bin/php --
/srv/deployment/jobrunner/jobrunner/redisJobRunnerService \
- --config-file="${JOBRUNNER_CONFIG:-/etc/jobrunner.ini}" $DAEMON_OPTS \
+ --config-file="${JOBRUNNER_CONFIG:-/etc/jobrunner.conf}" $DAEMON_OPTS \
>> "${JOBRUNNER_LOGFILE:-/var/log/mediawiki/jobrunner.log}" 2>&1
end script
diff --git a/modules/mediawiki/files/jobrunner.default
b/modules/mediawiki/files/jobrunner.default
index 4282e45..bb9dbdd 100644
--- a/modules/mediawiki/files/jobrunner.default
+++ b/modules/mediawiki/files/jobrunner.default
@@ -1,5 +1,5 @@
# Options for the MediaWiki jobrunner
-JOBRUNNER_CONFIG="/etc/jobrunner/jobrunner.ini"
+JOBRUNNER_CONFIG="/etc/jobrunner/jobrunner.conf"
JOBRUNNER_PID="/var/run/jobrunner/pid"
JOBRUNNER_USER="apache"
JOBRUNNER_GROUP="apache"
--
To view, visit https://gerrit.wikimedia.org/r/150084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I542114e9c5c2b2097d16f088a4ace37ede8e537e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
