[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update debian packaging
jenkins-bot has submitted this change and it was merged.
Change subject: Update debian packaging
..
Update debian packaging
Change-Id: I47023d191a4fee793adc7cd259ec5aca0454dab9
---
M debian/changelog
A debian/config.dev.yaml
D debian/config.yaml
A debian/config.yaml
M debian/control
M debian/cxserver.default
M debian/cxserver.install
A debian/cxserver.service
A debian/registry.yaml
M debian/rules
10 files changed, 1,289 insertions(+), 1,226 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/debian/changelog b/debian/changelog
index 569a813..fc7ebda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
+cxserver (0.3) unstable; urgency=low
+
+ * Updated for new config format.
+ * Fixed cxserver.install.
+
+ -- Kartik Mistry Thu, 03 Nov 2016 15:09:29 +0530
+
cxserver (0.2) unstable; urgency=low
* Update as per cxserver's service-runner migration.
-- Kartik Mistry Mon, 22 Feb 2016 10:43:47 +0530
-cxserver (0.1) UNRELEASED; urgency=low
+cxserver (0.1) unstable; urgency=low
* Initial release based on Parsoid Debian package.
diff --git a/debian/config.dev.yaml b/debian/config.dev.yaml
new file mode 100644
index 000..f17e684
--- /dev/null
+++ b/debian/config.dev.yaml
@@ -0,0 +1,71 @@
+
+# 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: 0
+
+# Log error messages and gracefully restart a worker if v8 reports that it
+# uses more heap (note: not RSS) than this many megabytes.
+worker_heap_limit_mb: 250
+
+# Logger info
+logging:
+ level: trace
+# streams:
+# # Use gelf-stream -> logstash
+#- type: gelf
+#host: logstash1003.eqiad.wmnet
+#port: 12201
+
+# Statsd metrics reporter
+metrics:
+ type: log
+ #host: localhost
+ #port: 8125
+
+services:
+ - name: cxserver
+# a relative path or the name of an npm package, if different from name
+module: ./app.js
+# optionally, a version constraint of the npm package
+# version: ^0.4.0
+# per-service config
+conf:
+ port: 8080
+ # interface: localhost # uncomment to only listen on localhost
+ # More per-service config settings
+ # The location of the spec, defaults to spec.yaml if not specified
+ # spec: ./spec.yaml
+ # allow cross-domain requests to the API (default *)
+ cors: '*'
+ # to disable use:
+ # cors: false
+ # to restrict to a particular domain, use:
+ # cors: restricted.domain.org
+ # URL of the outbound proxy to use (complete with protocol)
+ # proxy: http://my.proxy.org:8080
+ # the list of domains for which not to use the proxy defined above
+ # no_proxy_list:
+ # - domain1.com
+ # - domain2.org
+ user_agent: cxserver
+ restbase_req:
+method: '{{request.method}}'
+uri: https://{{domain}}/api/rest_v1/{+path}
+query: '{{ default(request.query, {}) }}'
+headers: '{{request.headers}}'
+body: '{{request.body}}'
+ jwt:
+secret: ''
+algorithms:
+ - HS256
+ mt:
+# Apertium web API URL
+apertium:
+ api: http://apertium.wmflabs.org
+yandex:
+ api: https://translate.yandex.net
+ key: null
+youdao:
+ api: https://fanyi.youdao.com/paidapi/fanyiapi
+ key: null
+ registry: ./registry.yaml
diff --git a/debian/config.yaml b/debian/config.yaml
deleted file mode 100644
index f3ae651..000
--- a/debian/config.yaml
+++ /dev/null
@@ -1,1213 +0,0 @@
-
-# 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: 0
-
-# Log error messages and gracefully restart a worker if v8 reports that it
-# uses more heap (note: not RSS) than this many megabytes.
-worker_heap_limit_mb: 250
-
-# Logger info
-logging:
- level: trace
-# streams:
-# # Use gelf-stream -> logstash
-#- type: gelf
-#host: logstash1003.eqiad.wmnet
-#port: 12201
-
-# Statsd metrics reporter
-metrics:
- type: log
- #host: localhost
- #port: 8125
-
-services:
- - name: cxserver
-# a relative path or the name of an npm package, if different from name
-module: ./app.js
-# optionally, a version constraint of the npm package
-# version: ^0.4.0
-# per-service config
-conf:
- port: 8080
- # interface: localhost # uncomment to only listen on localhost
- # More per-service config settings
- # The location of the spec, defaults to spec.yaml if not specified
- # spec: ./spec.yaml
- # allow cross-domain requests to the API (default *)
- cors: '*'
- # to disable use:
- # cors: false
- # to restrict to a particular domain, use:
- # cors: restricted.domain.org
- # URL of the outbound proxy
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update debian packaging
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319534
Change subject: Update debian packaging
..
Update debian packaging
Change-Id: I47023d191a4fee793adc7cd259ec5aca0454dab9
---
M debian/changelog
A debian/config.dev.yaml
D debian/config.yaml
A debian/config.yaml
M debian/cxserver.install
A debian/registry.yaml
6 files changed, 1,261 insertions(+), 1,215 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver/deploy
refs/changes/34/319534/1
diff --git a/debian/changelog b/debian/changelog
index 569a813..fc7ebda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
+cxserver (0.3) unstable; urgency=low
+
+ * Updated for new config format.
+ * Fixed cxserver.install.
+
+ -- Kartik Mistry Thu, 03 Nov 2016 15:09:29 +0530
+
cxserver (0.2) unstable; urgency=low
* Update as per cxserver's service-runner migration.
-- Kartik Mistry Mon, 22 Feb 2016 10:43:47 +0530
-cxserver (0.1) UNRELEASED; urgency=low
+cxserver (0.1) unstable; urgency=low
* Initial release based on Parsoid Debian package.
diff --git a/debian/config.dev.yaml b/debian/config.dev.yaml
new file mode 100644
index 000..f17e684
--- /dev/null
+++ b/debian/config.dev.yaml
@@ -0,0 +1,71 @@
+
+# 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: 0
+
+# Log error messages and gracefully restart a worker if v8 reports that it
+# uses more heap (note: not RSS) than this many megabytes.
+worker_heap_limit_mb: 250
+
+# Logger info
+logging:
+ level: trace
+# streams:
+# # Use gelf-stream -> logstash
+#- type: gelf
+#host: logstash1003.eqiad.wmnet
+#port: 12201
+
+# Statsd metrics reporter
+metrics:
+ type: log
+ #host: localhost
+ #port: 8125
+
+services:
+ - name: cxserver
+# a relative path or the name of an npm package, if different from name
+module: ./app.js
+# optionally, a version constraint of the npm package
+# version: ^0.4.0
+# per-service config
+conf:
+ port: 8080
+ # interface: localhost # uncomment to only listen on localhost
+ # More per-service config settings
+ # The location of the spec, defaults to spec.yaml if not specified
+ # spec: ./spec.yaml
+ # allow cross-domain requests to the API (default *)
+ cors: '*'
+ # to disable use:
+ # cors: false
+ # to restrict to a particular domain, use:
+ # cors: restricted.domain.org
+ # URL of the outbound proxy to use (complete with protocol)
+ # proxy: http://my.proxy.org:8080
+ # the list of domains for which not to use the proxy defined above
+ # no_proxy_list:
+ # - domain1.com
+ # - domain2.org
+ user_agent: cxserver
+ restbase_req:
+method: '{{request.method}}'
+uri: https://{{domain}}/api/rest_v1/{+path}
+query: '{{ default(request.query, {}) }}'
+headers: '{{request.headers}}'
+body: '{{request.body}}'
+ jwt:
+secret: ''
+algorithms:
+ - HS256
+ mt:
+# Apertium web API URL
+apertium:
+ api: http://apertium.wmflabs.org
+yandex:
+ api: https://translate.yandex.net
+ key: null
+youdao:
+ api: https://fanyi.youdao.com/paidapi/fanyiapi
+ key: null
+ registry: ./registry.yaml
diff --git a/debian/config.yaml b/debian/config.yaml
deleted file mode 100644
index f3ae651..000
--- a/debian/config.yaml
+++ /dev/null
@@ -1,1213 +0,0 @@
-
-# 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: 0
-
-# Log error messages and gracefully restart a worker if v8 reports that it
-# uses more heap (note: not RSS) than this many megabytes.
-worker_heap_limit_mb: 250
-
-# Logger info
-logging:
- level: trace
-# streams:
-# # Use gelf-stream -> logstash
-#- type: gelf
-#host: logstash1003.eqiad.wmnet
-#port: 12201
-
-# Statsd metrics reporter
-metrics:
- type: log
- #host: localhost
- #port: 8125
-
-services:
- - name: cxserver
-# a relative path or the name of an npm package, if different from name
-module: ./app.js
-# optionally, a version constraint of the npm package
-# version: ^0.4.0
-# per-service config
-conf:
- port: 8080
- # interface: localhost # uncomment to only listen on localhost
- # More per-service config settings
- # The location of the spec, defaults to spec.yaml if not specified
- # spec: ./spec.yaml
- # allow cross-domain requests to the API (default *)
- cors: '*'
- # to disable use:
- # cors: false
- # to restrict to a particular domain, use:
- # cors: restricted.domain.org
- # URL of the outbound proxy to use (complete with pr
