GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/111350
Change subject: Bug 60694: Make the config file path configurable ...................................................................... Bug 60694: Make the config file path configurable This is a stop-gap solution to get bug 60694 fixed by supporting a different config file path in beta vs. production. In the longer term we should probably puppetize /etc/parsoid/settings.js differently, and use the Debian package as developed in https://gerrit.wikimedia.org/r/#/c/110666/ for installs. Change-Id: I51b26c0aed75f8a8614c560c45b98320b74c31e0 --- M files/misc/parsoid.upstart M manifests/role/parsoid.pp M templates/misc/parsoid.default.erb 3 files changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/50/111350/1 diff --git a/files/misc/parsoid.upstart b/files/misc/parsoid.upstart index fbfda9a..2867a4e 100644 --- a/files/misc/parsoid.upstart +++ b/files/misc/parsoid.upstart @@ -24,6 +24,7 @@ env NODE_PATH="/var/lib/parsoid/deploy/node_modules" env PARSOID_BASE_PATH="/var/lib/parsoid/deploy/src" env PARSOID_LOG_FILE="/dev/null" +env PARSOID_SETTINGS_FILE="../conf/wmf/localsettings.js" respawn @@ -36,6 +37,7 @@ if [ -f "$DEFAULTFILE" ] ; then . "$DEFAULTFILE" fi + DAEMON_ARGS="-c $PARSOID_SETTINGS_FILE" chdir "$PARSOID_BASE_PATH" - exec /usr/bin/nodejs api/server.js -c ../conf/wmf/localsettings.js < /dev/null >> "$PARSOID_LOG_FILE" 2>&1 + exec /usr/bin/nodejs api/server.js $DAEMON_ARGS < /dev/null >> "$PARSOID_LOG_FILE" 2>&1 end script diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp index 6a54265..47dc4c0 100644 --- a/manifests/role/parsoid.pp +++ b/manifests/role/parsoid.pp @@ -81,6 +81,7 @@ $parsoid_log_file = '/var/log/parsoid/parsoid.log' $parsoid_node_path = '/var/lib/parsoid/deploy/node_modules' + $parsoid_settings_file = '../conf/wmf/localsettings.js' $parsoid_base_path = '/var/lib/parsoid/deploy/src' #TODO: Duplication of code from beta class, deduplicate somehow @@ -185,6 +186,9 @@ $parsoid_log_file = '/var/log/parsoid/parsoid.log' # For beta, override NODE_PATH: $parsoid_node_path = '/srv/deployment/parsoid/deploy/node_modules' + # Also override PARSOID_SETTINGS_FILE + $parsoid_settings_file = '/src/deployment/parsoid/localsettings.js' + # Checkout of mediawiki/services/parsoid $parsoid_base_path = '/srv/deployment/parsoid/parsoid' diff --git a/templates/misc/parsoid.default.erb b/templates/misc/parsoid.default.erb index 3ba27e2..fc62a45 100644 --- a/templates/misc/parsoid.default.erb +++ b/templates/misc/parsoid.default.erb @@ -21,3 +21,11 @@ # Override in puppet using parsoid_node_path #NODE_PATH= <% end %> + +# Checkout of mediawiki/services/parsoid/deploy +<% if @parsoid_settings_file then %> +PARSOID_SETTINGS_FILE=<%= @parsoid_settings_file %> +<% else %> +# Override in puppet using parsoid_settings_file +#PARSOID_SETTINGS_FILE=/etc/parsoid/settings.js +<% end %> -- To view, visit https://gerrit.wikimedia.org/r/111350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51b26c0aed75f8a8614c560c45b98320b74c31e0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: GWicke <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
