launchpad-reviewers team mailing list archive

[Yuliy Schwartzburg <mp+471257@xxxxxxxxxxxxxxxxxx>]

Yuliy Schwartzburg has proposed merging ~ikoruk/launchpad:user-agents into launchpad:master.

Commit message:
fix non-ascii characters in jinja templates

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ikoruk/launchpad/+git/launchpad/+merge/471257
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ikoruk/launchpad:user-agents into launchpad:master.

diff --git a/charm/launchpad-appserver/templates/vhosts/api-https.conf.j2 b/charm/launchpad-appserver/templates/vhosts/api-https.conf.j2
index f9ed5fe..5fabaf7 100644
--- a/charm/launchpad-appserver/templates/vhosts/api-https.conf.j2
+++ b/charm/launchpad-appserver/templates/vhosts/api-https.conf.j2
@@ -30,10 +30,10 @@
 
     RewriteEngine on
 
-{% if blocked_user_agents %}
+{%- if blocked_user_agents %}
     # Block certain user agents
     RewriteCond %{HTTP_USER_AGENT} ^.*({{ blocked_user_agents }}).*$ [NC]
-    RewriteRule .* – [F,L]
+    RewriteRule .* - [F,L]
 {%- endif %}
 
     RewriteRule ^/offline\.html$ - [PT]
diff --git a/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2 b/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2
index 7aac31e..c270fa2 100644
--- a/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2
+++ b/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2
@@ -38,10 +38,10 @@
 
     RewriteEngine on
 
-{% if blocked_user_agents %}
+{%- if blocked_user_agents %}
     # Block certain user agents
     RewriteCond %{HTTP_USER_AGENT} ^.*({{ blocked_user_agents }}).*$ [NC]
-    RewriteRule .* – [F,L]
+    RewriteRule .* - [F,L]
 {%- endif %}
 
 {% if google_site_verification %}