Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/384658 )
Change subject: Config: Use TLS in beta
......................................................................
Config: Use TLS in beta
Change-Id: I22deabbfee432007dbb909e10033d2ed256a0e50
---
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
3 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/58/384658/1
diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index 80069e9..6f30b15 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -1,3 +1,4 @@
+env: beta
salt_key: '123456'
page_size: 10
user_agent: RESTBase/deployment-prep
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 5619db0..2e28fa2 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -83,6 +83,7 @@
username: <%= cassandra_user %>
password: <%= cassandra_password %>
defaultConsistency: <%= cassandra_default_consistency %>
+ <% if env == 'beta' %>tls: { ca: '/dev/null' }<% endif %>
<% if cassandra_tls is not none and cassandra_tls|length > 0
%>tls:<% for key, value in cassandra_tls.iteritems() %>
<%= key %>: <%= value -%>
<% endfor -%>
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 656fc15..b972264 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -8,6 +8,7 @@
metrics_host: localhost
metrics_port: 8252
# service
+env: production
mwapi_uri: http://localhost/w/api.php
ipaddress: '127.0.0.1'
rl_seeds: []
--
To view, visit https://gerrit.wikimedia.org/r/384658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22deabbfee432007dbb909e10033d2ed256a0e50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
