Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347623 )
Change subject: Scap3 Config: Some more Jinja2 fixes
......................................................................
Scap3 Config: Some more Jinja2 fixes
Bug: T116335
Change-Id: I2db0a77e219abdd6f4fdfb8aaa6e28ae92bfbb14
---
M scap/environments/beta/templates/config.yaml.j2
M scap/templates/config.yaml.j2
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/23/347623/1
diff --git a/scap/environments/beta/templates/config.yaml.j2
b/scap/environments/beta/templates/config.yaml.j2
index 91b9b29..01ba4ed 100644
--- a/scap/environments/beta/templates/config.yaml.j2
+++ b/scap/environments/beta/templates/config.yaml.j2
@@ -57,12 +57,12 @@
username: <%= cassandra_user %>
password: <%= cassandra_password %>
defaultConsistency: <%= cassandra_default_consistency %>
-<% if cassandra_tls is not None and cassandra_tls|length > 0 -%>
+<% if cassandra_tls is not none and cassandra_tls|length > 0 -%>
tls:
<% for key, value in cassandra_tls.iteritems() -%>
<%= key %>: <%= value %>
<% endfor -%>
-<% endif -%>
+<% endif %>
storage_groups:
# Catch-all group
- name: default.group.local
@@ -90,7 +90,7 @@
cache_control: s-maxage=86400, max-age=3600
# Cache headers for purged end points.
purged_cache_control: s-maxage=1209600, max-age=0, must-revalidate
- skip_updates: <%= skip_updates %>
+ skip_updates: <%= 'true' if skip_updates else 'false' %>
pdf:
cache_control: s-maxage=600, max-age=600
uri: <%= pdfrender_uri %>
@@ -138,7 +138,7 @@
name: http
options:
allow:
- - pattern: <%= mwpi_uri %>
+ - pattern: <%= mwapi_uri %>
forward_headers: true
- pattern: <%= parsoid_uri %>
forward_headers: true
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 4f82014..2626e8a 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -62,12 +62,12 @@
username: <%= cassandra_user %>
password: <%= cassandra_password %>
defaultConsistency: <%= cassandra_default_consistency %>
-<% if cassandra_tls is not None and cassandra_tls|length > 0 -%>
+<% if cassandra_tls is not none and cassandra_tls|length > 0 -%>
tls:
<% for key, value in cassandra_tls.iteritems() -%>
<%= key %>: <%= value %>
<% endfor -%>
-<% endif -%>
+<% endif %>
storage_groups:
- name: phase0.group.local
domains:
@@ -118,7 +118,7 @@
cache_control: s-maxage=86400, max-age=3600
# Cache headers for purged end points.
purged_cache_control: s-maxage=1209600, max-age=0, must-revalidate
- skip_updates: <%= skip_updates %>
+ skip_updates: <%= 'true' if skip_updates else 'false' %>
pdf:
cache_control: s-maxage=600, max-age=600
uri: <%= pdfrender_uri %>
@@ -166,7 +166,7 @@
name: http
options:
allow:
- - pattern: <%= mwpi_uri %>
+ - pattern: <%= mwapi_uri %>
forward_headers: true
- pattern: <%= parsoid_uri %>
forward_headers: true
--
To view, visit https://gerrit.wikimedia.org/r/347623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2db0a77e219abdd6f4fdfb8aaa6e28ae92bfbb14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
