Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/171797
Change subject: ocg templates: retab
..
ocg templates: retab
Change-Id: Id1539470e0882b7273b36a4855d70f73baaf65e6
---
M modules/ocg/templates/mw-ocg-service.js.erb
M modules/ocg/templates/usr.bin.nodejs.apparmor.erb
2 files changed, 28 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/171797/1
diff --git a/modules/ocg/templates/mw-ocg-service.js.erb
b/modules/ocg/templates/mw-ocg-service.js.erb
index 53cd84c..45c6deb 100644
--- a/modules/ocg/templates/mw-ocg-service.js.erb
+++ b/modules/ocg/templates/mw-ocg-service.js.erb
@@ -8,38 +8,38 @@
* -- */
module.exports = function (config) {
- // Import the public local settings
- config = require(/srv/deployment/ocg/ocg/LocalSettings.js)(config);
+// Import the public local settings
+config = require(/srv/deployment/ocg/ocg/LocalSettings.js)(config);
- config.coordinator.hostname = %= @host_name %;
+config.coordinator.hostname = %= @host_name %;
- config.redis.host = %= @redis_host %;
- config.redis.port = %= @redis_port %;
- config.redis.password = %= @redis_password %;
+config.redis.host = %= @redis_host %;
+config.redis.port = %= @redis_port %;
+config.redis.password = %= @redis_password %;
- config.frontend.port = %= @service_port %;
+config.frontend.port = %= @service_port %;
- config.reporting.statsd_server = %= @statsd_host %;
- config.reporting.statsd_port = %= @statsd_port %;
- config.reporting.is_txstatsd = %= @statsd_is_txstatsd %;
+config.reporting.statsd_server = %= @statsd_host %;
+config.reporting.statsd_port = %= @statsd_port %;
+config.reporting.is_txstatsd = %= @statsd_is_txstatsd %;
- // File paths; there is a short term temp directory, a long term
- // storage directory, and a medium term error directory
- config.backend.temp_dir = %= @temp_dir %;
- config.backend.output_dir = %= @output_dir %;
- config.backend.post_mortem_dir = %= @postmortem_dir %;
+// File paths; there is a short term temp directory, a long term
+// storage directory, and a medium term error directory
+config.backend.temp_dir = %= @temp_dir %;
+config.backend.output_dir = %= @output_dir %;
+config.backend.post_mortem_dir = %= @postmortem_dir %;
- // Temporary backwards compatibility with winston logging
- // (pre-2014-11-03 deploy)
- if (!config.logging.streams) { return config; }
+// Temporary backwards compatibility with winston logging
+// (pre-2014-11-03 deploy)
+if (!config.logging.streams) { return config; }
- // Configure logging to logstash, via bunyan/gelf-stream.
- config.logging.streams.push({
- type: 'raw',
- stream:
require('/srv/deployment/ocg/ocg/node_modules/gelf-stream').forBunyan(
- %= @graylog_host %, %= @graylog_port %
- )
- });
+// Configure logging to logstash, via bunyan/gelf-stream.
+config.logging.streams.push({
+type: 'raw',
+stream:
require('/srv/deployment/ocg/ocg/node_modules/gelf-stream').forBunyan(
+%= @graylog_host %, %= @graylog_port %
+)
+});
- return config;
+return config;
}
diff --git a/modules/ocg/templates/usr.bin.nodejs.apparmor.erb
b/modules/ocg/templates/usr.bin.nodejs.apparmor.erb
old mode 100755
new mode 100644
index 2cfcf8d..d008de6
--- a/modules/ocg/templates/usr.bin.nodejs.apparmor.erb
+++ b/modules/ocg/templates/usr.bin.nodejs.apparmor.erb
@@ -68,8 +68,8 @@
/tmp/** rwk,
%= @temp_dir %/** rwk,
- # Useful for debugging :)
- /srv/deployment/ocg/ocg/mw-ocg-texter/samples/* r,
+# Useful for debugging :)
+/srv/deployment/ocg/ocg/mw-ocg-texter/samples/* r,
/srv/deployment/ocg/ocg/mw-ocg-latexer/samples/* r,
}
--
To view, visit https://gerrit.wikimedia.org/r/171797
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1539470e0882b7273b36a4855d70f73baaf65e6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
