Gehel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/322895
Change subject: Revert "Kartotherian: deploy application configuration with
scap3"
......................................................................
Revert "Kartotherian: deploy application configuration with scap3"
This reverts commit cf0ab9984352a99c768d02a31e774b4cd78a842f.
---
D scap/config-files.yaml
M scap/scap.cfg
D scap/templates/config.yaml.j2
3 files changed, 0 insertions(+), 78 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/maps/kartotherian/deploy
refs/changes/95/322895/1
diff --git a/scap/config-files.yaml b/scap/config-files.yaml
deleted file mode 100644
index 40f36fe..0000000
--- a/scap/config-files.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-/etc/kartotherian/config.yaml:
- template: config.yaml.j2
- erb_syntax: True
- remote_vars: /etc/kartotherian/config-vars.yaml
diff --git a/scap/scap.cfg b/scap/scap.cfg
index 52a1302..c80ee37 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -10,7 +10,6 @@
service_name: kartotherian
service_port: 6533
lock_file: /tmp/scap.kartotherian.lock
-config_deploy: True
[wmnet]
# git_server: mira.codfw.wmnet
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
deleted file mode 100644
index 0323265..0000000
--- a/scap/templates/config.yaml.j2
+++ /dev/null
@@ -1,72 +0,0 @@
-logging:
- level: warn
- name: <%= log_name %>
- streams:
- - host: <%= logstash_host %>
- port: <%= logstash_port %>
- type: gelf
- - level: info
- path: <%= log_file %>
- type: file
-metrics:
- host: <%= metrics_host %>
- name: <%= metrics_name %>
- port: <%= metrics_port %>
- type: statsd
-num_workers: <%= num_workers %>
-services:
- - conf:
- allowedDomains:
- https:
- - mediawiki.org
- - wikibooks.org
- - wikidata.org
- - wikimedia.org
- - wikimediafoundation.org
- - wikinews.org
- - wikipedia.org
- - wikiquote.org
- - wikisource.org
- - wikiversity.org
- - wikivoyage.org
- - wiktionary.org
- cors: "*"
- geoshapes:
- allowUserQueries: true
- database: gis
- host: localhost
- lineTable: planet_osm_line
- password: <%= geoshapes_password %>
- polygonTable: planet_osm_polygon
- table: planet_osm_polygon
- user: <%= geoshapes_user %>
- mwapi_req:
- body: "{{ default(request.query, {}) }}"
- headers:
- host: "{{request.params.domain}}"
- user-agent: "{{user-agent}}"
- method: post
- uri: <%= mwapi %>
- port: <%= port %>
- proxy: <%= proxy %>
- restbase_req:
- body: "{{request.body}}"
- headers: "{{request.headers}}"
- method: "{{request.method}}"
- query: "{{ default(request.query, {}) }}"
- uri: "<%= restbase %>/{{domain}}/v1/{+path}"
- sources: <%= conf_sources %>
- variables:
- cassandra-pswd: <%= cassandra_password %>
- cassandra-servers:
- <% for server in cassandra_servers -%>
- - <%= server %>
- <% endfor -%>
- cassandra-user: <%= cassandra_user %>
- osmdb-pswd: <%= osmdb_password %>
- osmdb-user: <%= osmdb_user %>
- entrypoint: <%= entrypoint %>
- module: <%= module %>
- name: <%= name %>
-worker_heap_limit_mb: <%= worker_heap_limit_mb %>
-worker_heartbeat_timeout: <%= worker_heartbeat_timeout %>
--
To view, visit https://gerrit.wikimedia.org/r/322895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5497ef9ea3dd1cc4c0fdc1e9808ef7ca04fb6701
Gerrit-PatchSet: 1
Gerrit-Project: maps/kartotherian/deploy
Gerrit-Branch: master
Gerrit-Owner: Gehel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
