Issue 2104 - Set up a test server for adblockplus.org content

modules/web/templates/site.conf.erb

Index: modules/web/templates/site.conf.erb
===================================================================
--- a/modules/web/templates/site.conf.erb
+++ b/modules/web/templates/site.conf.erb
@@ -1,15 +1,16 @@
 expires 1d;
 
 root /var/www/<%= vhost %>;
 index index;
 default_type text/html;
+charset utf-8;
 
-<% if custom_config %>
+<% if @custom_config %>
   <%= custom_config %>

[Felix Dahlke, 2015/03/13 16:24:10]

I think we need to add the @ here too - it's either an instance variable or a
local one, hm?

[Wladimir Palant, 2015/03/13 16:27:06]

Frankly, I have no idea about the significance of @ in the ERB templates.
However, the documentation said that @ has to be used when testing for nil.
Unlike the if statement, this include works correctly however.

[Felix Dahlke, 2015/03/13 16:33:34]

Having read up on this, @ apparently has special significance in ERB files: It's
an ERB variable, while not prepending an @ would just evaluate Ruby code, which
would result in the value of a variable of that name.

So it does sound like we have add an @ here. On the other hand, if it works this
way, alright. Matze can probably say more about this when he's back.

 <% end %>
 
 # Match Accept-Language header against available languages
 
 set $preferredLang "";
 if ($http_accept_language ~ ^(\w\w)-(\w\w)\b)
 {