Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: modules/web/templates/global.conf.erb

Issue 29352911: Issue 4420 - Allow embedding YouTube videos on the blog (Closed) Base URL: https://hg.adblockplus.org/infrastructure
Patch Set: Created Sept. 13, 2016, 12:20 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « modules/web/templates/adblockplus.org.conf.erb ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/web/templates/global.conf.erb
===================================================================
--- a/modules/web/templates/global.conf.erb
+++ b/modules/web/templates/global.conf.erb
@@ -2,18 +2,18 @@
<%- @aliases.each do |vhost_alias| %>
server
{
server_name '<%= vhost_alias %>';
listen 80;
listen [::]:80;
<%- if @certificate != @private_key %>
- listen 443 ssl spdy;
- listen [::]:443 ssl spdy;
+ listen 443 ssl http2;
+ listen [::]:443 ssl http2;
ssl_certificate <%= @certificate %>;
ssl_certificate_key <%= @private_key %>;
location /
{
rewrite .* https://<%= @vhost %>/ redirect;
}
@@ -22,9 +22,8 @@ server
location /
{
rewrite .* http://<%= @vhost %>/ redirect;
}
<%- end %>
}
<%- end %>
<%- end %>
-
« no previous file with comments | « modules/web/templates/adblockplus.org.conf.erb ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld