Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/321861
Change subject: Use Scap3 to deploy the config
......................................................................
Use Scap3 to deploy the config
Bug: T147634
Depends-On: I235196977204d107e92bf60319867895bd81849f
Change-Id: I2a765cd3bef688bac87c4e99b84d18faa7cd9c4e
---
A scap/config-files.yaml
A scap/environments/beta/vars.yaml
M scap/scap.cfg
A scap/templates/config.yaml.j2
A scap/vars.yaml
5 files changed, 95 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver/deploy
refs/changes/61/321861/1
diff --git a/scap/config-files.yaml b/scap/config-files.yaml
new file mode 100644
index 0000000..7cf387d
--- /dev/null
+++ b/scap/config-files.yaml
@@ -0,0 +1,5 @@
+---
+/etc/cxserver/config.yaml:
+ template: config.yaml.j2
+ erb_syntax: True
+ remote_vars: /etc/cxserver/config-vars.yaml
diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
new file mode 100644
index 0000000..4ad3c24
--- /dev/null
+++ b/scap/environments/beta/vars.yaml
@@ -0,0 +1 @@
+registry: registry.yaml
diff --git a/scap/scap.cfg b/scap/scap.cfg
index 5a25891..61f19a5 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -10,11 +10,13 @@
service_name: cxserver
service_port: 8080
lock_file: /tmp/scap.cxserver.lock
+config_deploy: True
[wmnet]
-git_server: deployment.eqiad.wmnet
+git_server: tin.eqiad.wmnet
[deployment-prep.eqiad.wmflabs]
git_server: deployment-tin.deployment-prep.eqiad.wmflabs
+environment: beta
server_groups: default
dsh_targets: betacluster-targets
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
new file mode 100644
index 0000000..3598a66
--- /dev/null
+++ b/scap/templates/config.yaml.j2
@@ -0,0 +1,69 @@
+# Number of worker processes to spawn.
+# Set to 0 to run everything in a single process without clustering.
+# Use 'ncpu' to run as many workers as there are CPU units
+num_workers: ncpu
+
+# Log error messages and gracefully restart a worker if v8 reports that it
+# uses more heap (note: not RSS) than this many mb.
+worker_heap_limit_mb: 300
+
+# The maximum interval in ms that can pass between two beat messages
+# sent by each worker to the master before it is killed
+worker_heartbeat_timeout: 7500
+
+# Logger info
+logging:
+ level: warn
+ name: cxserver
+ streams:
+ - host: <%= logstash_host %>
+ port: <%= logstash_port %>
+ type: gelf
+ - level: info
+ path: <%= log_file %>
+ type: file
+
+# Statsd metrics reporter
+metrics:
+ name: cxserver
+ host: <%= metrics_host %>
+ port: <%= metrics_port %>
+ type: statsd
+
+services:
+ - name: cxserver
+ module: src/app.js
+ conf:
+ cors: "*"
+ port: <%= port %>
+ mwapi_req:
+ body: "{{ default(request.query, {}) }}"
+ headers:
+ host: "{{request.params.domain}}"
+ user-agent: "{{user-agent}}"
+ method: post
+ uri: <%= mwapi_uri %>
+ restbase_req:
+ body: "{{request.body}}"
+ headers: "{{request.headers}}"
+ method: "{{request.method}}"
+ query: "{{ default(request.query, {}) }}"
+ uri: <%= restbase_uri %>/{{domain}}/v1/{+path}
+ no_proxy_list:
+ - eqiad.wmnet
+ - codfw.wmnet
+ proxy: <%= proxy if proxy else '' %>
+ registry: <%= registry %>
+ jwt:
+ algorithms:
+ - HS256
+ secret: "<%= jwt_token %>"
+ mt:
+ apertium:
+ api: "<%= apertium_uri %>"
+ yandex:
+ api: https://translate.yandex.net
+ key: "<%= yandex_key %>"
+ youdao:
+ api: https://fanyi.youdao.com/paidapi/fanyiapi
+ key: "<%= youdao_key %>"
diff --git a/scap/vars.yaml b/scap/vars.yaml
new file mode 100644
index 0000000..4f962cd
--- /dev/null
+++ b/scap/vars.yaml
@@ -0,0 +1,17 @@
+# log-related variables
+logstash_host: localhost
+logstash_port: 12201
+log_file: /tmp/citoid.log
+# metrics
+metrics_host: localhost
+metrics_port: 8125
+# service
+port: 8080
+mwapi_uri: https://{{domain}}/w/api.php
+restbase_uri: http://localhost:7231
+proxy:
+registry: registry.wikimedia.yaml
+jwt_token: abcdef
+apertium_uri: http://localhost:2737
+yandex_key: abcdefg
+youdao_key: abcdefg
--
To view, visit https://gerrit.wikimedia.org/r/321861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a765cd3bef688bac87c4e99b84d18faa7cd9c4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
