jenkins-bot has submitted this change and it was merged. Change subject: Update debian/ ......................................................................
Update debian/ Bug: T125620 T127308 Change-Id: I4e6202317d1c80f29c1fbb4372c70e3d6574a685 --- A debian/README.Debian M debian/changelog D debian/config.js A debian/config.yaml M debian/control M debian/upstart/cxserver.conf 6 files changed, 1,226 insertions(+), 12 deletions(-) Approvals: KartikMistry: Looks good to me, approved Filippo Giunchedi: Looks good to me, but someone else must approve Mobrovac: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..1101b10 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,4 @@ +Node.js dependency +================== + +cxserver depends on node.js >= 4.3 starting with 0.2 release. diff --git a/debian/changelog b/debian/changelog index dfdf024..569a813 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cxserver (0.2) unstable; urgency=low + + * Update as per cxserver's service-runner migration. + + -- Kartik Mistry <[email protected]> Mon, 22 Feb 2016 10:43:47 +0530 + cxserver (0.1) UNRELEASED; urgency=low * Initial release based on Parsoid Debian package. diff --git a/debian/config.js b/debian/config.js deleted file mode 100644 index bfb6268..0000000 --- a/debian/config.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -module.exports = { - port: 8080, - logDir: 'log', - parsoid: { - api: 'http://parsoid-lb.eqiad.wikimedia.org' - } -}; diff --git a/debian/config.yaml b/debian/config.yaml new file mode 100644 index 0000000..f3ae651 --- /dev/null +++ b/debian/config.yaml @@ -0,0 +1,1213 @@ + +# 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 + # RESTBase API URL + restbase_url: https://@lang.wikipedia.org/api/rest_v1/page/html/@title + jwt: + secret: '' + algorithms: + - HS256 + mt: + # Apertium web API URL + apertium: + api: http://apertium.wmflabs.org + yandex: + api: https://translate.yandex.net + key: null + registry: + source: + - ab + - ace + - ady + - af + - ak + - am + - ang + - an + - arc + - ar + - arz + - ast + - as + - av + - ay + - az + - azb + - bar + - ba + - bcl + - be-tarask + - be + - bg + - bho + - bi + - bjn + - bm + - bn + - bo + - bpy + - br + - bs + - bug + - bxr + - ca + - cbk-zam + - cdo + - ceb + - ce + - chr + - ch + - chy + - ckb + - co + - crh-latn + - cr + - csb + - cs + - cu + - cv + - cy + - da + - de + - diq + - dsb + - dv + - dz + - ee + - el + - eml + - en + - eo + - es + - et + - eu + - ext + - fa + - ff + - fi + - fj + - fo + - frp + - frr + - fr + - fur + - fy + - gag + - gan + - ga + - gd + - glk + - gl + - gn + - gom + - got + - gsw + - gu + - gv + - hak + - ha + - haw + - he + - hif + - hi + - hr + - hsb + - ht + - hu + - hy + - ia + - id + - ie + - ig + - ik + - ilo + - io + - is + - it + - iu + - ja + - jbo + - jv + - kaa + - kab + - ka + - kbd + - kg + - ki + - kk + - kl + - km + - kn + - koi + - ko + - krc + - ksh + - ks + - ku + - kv + - kw + - ky + - lad + - la + - lbe + - lb + - lez + - lg + - lij + - li + - lmo + - ln + - lo + - lrc + - ltg + - lt + - lv + - lzh + - mai + - map-bms + - mdf + - mg + - mhr + - min + - mi + - mk + - ml + - mn + - mrj + - mr + - ms + - mt + - mwl + - myv + - my + - mzn + - nah + - nan + - nap + - na + - nds-nl + - nds + - ne + - new + - nl + - nn + - nov + - 'no' + - nrm + - nso + - nv + - ny + - oc + - om + - or + - os + - pag + - pam + - pap + - pa + - pcd + - pdc + - pfl + - pih + - pi + - pl + - pms + - pnb + - pnt + - ps + - pt + - qu + - rm + - rmy + - rn + - roa-tara + - rup + - ro + - rue + - ru + - rw + - sah + - sa + - scn + - sco + - sc + - sd + - se + - sg + - sgs + - sh + - simple + - si + - sk + - sl + - sm + - sn + - so + - sq + - srn + - sr + - ss + - stq + - st + - su + - sv + - sw + - szl + - ta + - tet + - te + - tg + - th + - ti + - tk + - tl + - tn + - to + - tpi + - tr + - ts + - tt + - tum + - tw + - tyv + - ty + - udm + - ug + - uk + - ur + - uz + - vec + - vep + - ve + - vi + - vls + - vo + - vro + - war + - wa + - wo + - wuu + - xal + - xh + - xmf + - yi + - yo + - yue + - za + - zea + - zh + - zu + target: + - ab + - ace + - ady + - af + - ak + - am + - ang + - an + - arc + - ar + - arz + - ast + - as + - av + - ay + - az + - azb + - bar + - ba + - bcl + - be-tarask + - be + - bg + - bho + - bi + - bjn + - bm + - bn + - bo + - bpy + - br + - bs + - bug + - bxr + - ca + - cbk-zam + - cdo + - ceb + - ce + - chr + - ch + - chy + - ckb + - co + - crh-latn + - cr + - csb + - cs + - cu + - cv + - cy + - da + - de + - diq + - dsb + - dv + - dz + - ee + - el + - eml + - en + - eo + - es + - et + - eu + - ext + - fa + - ff + - fi + - fj + - fo + - frp + - frr + - fr + - fur + - fy + - gag + - gan + - ga + - gd + - glk + - gl + - gn + - gom + - got + - gsw + - gu + - gv + - hak + - ha + - haw + - he + - hif + - hi + - hr + - hsb + - ht + - hu + - hy + - ia + - id + - ie + - ig + - ik + - ilo + - io + - is + - it + - iu + - ja + - jbo + - jv + - kaa + - kab + - ka + - kbd + - kg + - ki + - kk + - kl + - km + - kn + - koi + - ko + - krc + - ksh + - ks + - ku + - kv + - kw + - ky + - lad + - la + - lbe + - lb + - lez + - lg + - lij + - li + - lmo + - ln + - lo + - lrc + - ltg + - lt + - lv + - lzh + - mai + - map-bms + - mdf + - mg + - mhr + - min + - mi + - mk + - ml + - mn + - mrj + - mr + - ms + - mt + - mwl + - myv + - my + - mzn + - nah + - nan + - nap + - na + - nds-nl + - nds + - ne + - new + - nl + - nn + - nov + - 'no' + - nrm + - nso + - nv + - ny + - oc + - om + - or + - os + - pag + - pam + - pap + - pa + - pcd + - pdc + - pfl + - pih + - pi + - pl + - pms + - pnb + - pnt + - ps + - pt + - qu + - rm + - rmy + - rn + - roa-tara + - rup + - ro + - rue + - ru + - rw + - sah + - sa + - scn + - sco + - sc + - sd + - se + - sg + - sgs + - sh + - simple + - si + - sk + - sl + - sm + - sn + - so + - sq + - srn + - sr + - ss + - stq + - st + - su + - sv + - sw + - szl + - ta + - tet + - te + - tg + - th + - ti + - tk + - tl + - tn + - to + - tpi + - tr + - ts + - tt + - tum + - tw + - tyv + - ty + - udm + - ug + - uk + - ur + - uz + - vec + - vep + - ve + - vi + - vls + - vo + - vro + - war + - wa + - wo + - wuu + - xal + - xh + - xmf + - yi + - yo + - yue + - za + - zea + - zh + - zu + mt: + Apertium: + af: + - nl + an: + - es + ar: + - mt + ast: + - es + bg: + - mk + ca: + - en + - es + - eo + - fr + - oc + - pt + - simple + cy: + - en + - simple + en: + - ca + - eo + - es + - gl + - sh + eo: + - en + - simple + es: + - an + - ast + - ca + - en + - eo + - fr + - gl + - it + - oc + - pt + - simple + eu: + - en + - es + - simple + fr: + - ca + - eo + - es + gl: + - en + - es + - simple + hi: + - ur + id: + - ms + is: + - en + - sv + it: + - ca + - es + kk: + - tt + mk: + - bg + - sr + ms: + - id + mt: + - ar + nl: + - af + nn: + - da + - nb + - 'no' + 'no': + - nn + oc: + - ca + - es + pt: + - ca + - es + - gl + ro: + - es + sh: + - en + - simple + - sl + simple: + - ca + - eo + - es + - gl + - sh + sl: + - sh + - sr + sv: + - da + - is + tt: + - kk + ur: + - hi + Yandex: + af: + - ba + - hy + - pl + - sq + - ru + ar: + - ba + - hy + - pl + - sq + - ru + - uz + az: + - ba + - hy + - pl + - sq + - ru + - uz + ba: + - hy + - pl + - sq + - ru + - uz + 'be-tarask': + - ba + - hy + - pl + - sq + - ru + - uz + be: + - ba + - hy + - pl + - sq + - ru + - uz + bg: + - ba + - hy + - pl + - sq + - ru + - uz + bs: + - ba + - hy + - pl + - sq + - ru + - uz + ca: + - ba + - hy + - pl + - sq + - ru + - uz + cs: + - ba + - hy + - pl + - sq + - ru + - uz + cy: + - ba + - hy + - pl + - sq + - ru + - uz + da: + - ba + - hy + - pl + - sq + - ru + - uz + de: + - ba + - hy + - pl + - sq + - ru + - uz + el: + - ba + - hy + - pl + - sq + - ru + - uz + en: + - ba + - hy + - pl + - sq + - ru + - uz + es: + - ba + - hy + - pl + - sq + - ru + - uz + et: + - ba + - hy + - pl + - sq + - ru + - uz + eu: + - ba + - hy + - pl + - sq + - ru + - uz + fa: + - ba + - hy + - pl + - sq + - ru + - uz + fi: + - ba + - hy + - pl + - sq + - ru + - uz + fr: + - ba + - hy + - pl + - sq + - ru + - uz + ga: + - ba + - hy + - pl + - sq + - ru + - uz + gl: + - ba + - hy + - pl + - sq + - ru + - uz + he: + - ba + - hy + - pl + - sq + - ru + - uz + hi: + - ba + - hy + - pl + - sq + - ru + - uz + hr: + - ba + - hy + - pl + - sq + - ru + - uz + ht: + - ba + - hy + - pl + - sq + - ru + - uz + hu: + - ba + - hy + - pl + - sq + - ru + - uz + hy: + - ba + - pl + - sq + - ru + - uz + id: + - ba + - hy + - pl + - sq + - ru + - uz + is: + - ba + - hy + - pl + - sq + - ru + - uz + it: + - ba + - hy + - pl + - sq + - ru + - uz + ja: + - ba + - hy + - pl + - sq + - ru + - uz + ka: + - ba + - hy + - pl + - sq + - ru + - uz + kk: + - ba + - hy + - pl + - sq + - ru + - uz + ko: + - ba + - hy + - pl + - sq + - ru + - uz + ky: + - ba + - hy + - pl + - sq + - ru + - uz + la: + - ba + - hy + - pl + - sq + - ru + - uz + lt: + - ba + - hy + - pl + - sq + - ru + - uz + lv: + - ba + - hy + - pl + - sq + - ru + - uz + mg: + - ba + - hy + - pl + - sq + - ru + - uz + mk: + - ba + - hy + - pl + - sq + - ru + - uz + mn: + - ba + - hy + - pl + - sq + - ru + - uz + ms: + - ba + - hy + - pl + - sq + - ru + - uz + mt: + - ba + - hy + - pl + - sq + - ru + - uz + nl: + - ba + - hy + - pl + - sq + - ru + - uz + 'no': + - ba + - hy + - pl + - sq + - ru + - uz + pl: + - ba + - hy + - sq + - ru + - uz + pt: + - ba + - hy + - pl + - sq + - ru + - uz + ro: + - ba + - hy + - pl + - sq + - ru + - uz + ru: + - ba + - hy + - pl + - sq + - uz + sk: + - ba + - hy + - pl + - sq + - ru + - uz + sl: + - ba + - hy + - pl + - sq + - ru + - uz + sq: + - ba + - hy + - pl + - ru + - uz + sr: + - ba + - hy + - pl + - sq + - ru + - uz + sv: + - ba + - hy + - pl + - sq + - ru + - uz + sw: + - ba + - hy + - pl + - sq + - ru + - uz + tg: + - ba + - hy + - pl + - sq + - ru + - uz + th: + - ba + - hy + - pl + - sq + - ru + - uz + tl: + - ba + - hy + - pl + - sq + - ru + - uz + tr: + - ba + - hy + - pl + - sq + - ru + - uz + tt: + - ba + - hy + - pl + - sq + - ru + - uz + uk: + - ba + - hy + - pl + - sq + - ru + - uz + ur: + - ba + - hy + - pl + - sq + - ru + - uz + uz: + - ba + - hy + - pl + - sq + - ru + vi: + - ba + - hy + - pl + - sq + - ru + - uz + zh: + - ba + - hy + - pl + - sq + - ru + - uz + dictionary: + Dictd: + en: + - hi + JsonDict: + ca: + - es + en: + - es + es: + - ca diff --git a/debian/control b/debian/control index 42beffc..e25cee4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Kartik Mistry <[email protected]> Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: https://www.mediawiki.org/wiki/ContentTranslation Vcs-Git: https://gerrit.wikimedia.org/r/mediawiki/services/cxserver/deploy @@ -12,7 +12,7 @@ Architecture: amd64 Depends: adduser, logrotate, - nodejs (>= 0.8.0), + nodejs (>= 4.3.0), ${misc:Depends}, ${shlibs:Depends} Enhances: mediawiki diff --git a/debian/upstart/cxserver.conf b/debian/upstart/cxserver.conf index 70a555f..946919b 100644 --- a/debian/upstart/cxserver.conf +++ b/debian/upstart/cxserver.conf @@ -13,6 +13,6 @@ env NODE_PATH="/var/lib/cxserver/src/node_modules" chdir "/var/lib/cxserver" -exec nodejs src/Server.js +exec nodejs src/server.js respawn -- To view, visit https://gerrit.wikimedia.org/r/272437 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e6202317d1c80f29c1fbb4372c70e3d6574a685 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/services/cxserver/deploy Gerrit-Branch: master Gerrit-Owner: KartikMistry <[email protected]> Gerrit-Reviewer: Alexandros Kosiaris <[email protected]> Gerrit-Reviewer: Amire80 <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: KartikMistry <[email protected]> Gerrit-Reviewer: Mobrovac <[email protected]> Gerrit-Reviewer: Santhosh <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
