[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Escape quotes in keys

2016-12-15 Thread Mobrovac (Code Review) 
Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/327501 )

Change subject: Config: Escape quotes in keys
..


Config: Escape quotes in keys

Bug: T147634
Change-Id: If5c679a2b21ac9add5205d040ab4e410752918f2
---
M scap/templates/config.yaml.j2
M scap/vars.yaml
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index d050bcc..55b873b 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -58,13 +58,13 @@
   jwt:
 algorithms:
   - HS256
-secret: "<%= jwt_token %>"
+secret: "<%= jwt_token.replace("\"", "\\\"") %>"
   mt:
 apertium:
   api: "<%= apertium_uri %>"
 yandex:
   api: https://translate.yandex.net
-  key: "<%= yandex_key %>"
+  key: "<%= yandex_key.replace("\"", "\\\"") %>"
 youdao:
   api: https://fanyi.youdao.com/paidapi/fanyiapi
-  key: "<%= youdao_key %>"
+  key: "<%= youdao_key.replace("\"", "\\\"") %>"
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 646a6bb..51f4eab 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -1,7 +1,7 @@
 # log-related variables
 logstash_host: localhost
 logstash_port: 12201
-log_file: /tmp/citoid.log
+log_file: /tmp/cxserver.log
 # metrics
 metrics_host: localhost
 metrics_port: 8125

-- 
To view, visit https://gerrit.wikimedia.org/r/327501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If5c679a2b21ac9add5205d040ab4e410752918f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: Mobrovac 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Escape quotes in keys

2016-12-15 Thread Mobrovac (Code Review) 
Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327501 )

Change subject: Config: Escape quotes in keys
..

Config: Escape quotes in keys

Bug: T147634
Change-Id: If5c679a2b21ac9add5205d040ab4e410752918f2
---
M scap/templates/config.yaml.j2
M scap/vars.yaml
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver/deploy 
refs/changes/01/327501/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index d050bcc..55b873b 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -58,13 +58,13 @@
   jwt:
 algorithms:
   - HS256
-secret: "<%= jwt_token %>"
+secret: "<%= jwt_token.replace("\"", "\\\"") %>"
   mt:
 apertium:
   api: "<%= apertium_uri %>"
 yandex:
   api: https://translate.yandex.net
-  key: "<%= yandex_key %>"
+  key: "<%= yandex_key.replace("\"", "\\\"") %>"
 youdao:
   api: https://fanyi.youdao.com/paidapi/fanyiapi
-  key: "<%= youdao_key %>"
+  key: "<%= youdao_key.replace("\"", "\\\"") %>"
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 646a6bb..51f4eab 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -1,7 +1,7 @@
 # log-related variables
 logstash_host: localhost
 logstash_port: 12201
-log_file: /tmp/citoid.log
+log_file: /tmp/cxserver.log
 # metrics
 metrics_host: localhost
 metrics_port: 8125

-- 
To view, visit https://gerrit.wikimedia.org/r/327501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5c679a2b21ac9add5205d040ab4e410752918f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits