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

Unified Diff: modules/discourse/templates/site.erb

Issue 6221863587938304: Issue 212 - Update Discourse (Closed)
Patch Set: Removed post action types Created March 27, 2014, 11:09 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/discourse/templates/discourse.conf.erb ('k') | modules/private-stub/manifests/discourse.pp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/discourse/templates/site.erb
===================================================================
rename from modules/discourse/files/intraforum.adblockplus.org
rename to modules/discourse/templates/site.erb
--- a/modules/discourse/files/intraforum.adblockplus.org
+++ b/modules/discourse/templates/site.erb
@@ -1,24 +1,38 @@
upstream discourse {
- server unix:///tmp/discourse-thin.sock;
+ server localhost:3000;
}
server {
- listen 80;
- listen [::]:80;
- server_name intraforum.adblockplus.org;
+ server_name <%= @domain %>;
+
+ <% if is_default %>
+ listen 80 default_server;
+ listen [::]:80 default_server;
+ <% else %>
+ listen 80;
+ listen [::]:80;
+ <% end %>
+
location / {
- rewrite (.*) https://intraforum.adblockplus.org$1 permanent;
+ rewrite (.*) https://$host$1 permanent;
}
}
server {
- listen 443 ssl;
- listen [::]:443 ssl;
- server_name intraforum.adblockplus.org;
+ server_name <%= @domain %>;
+
+ <% if is_default %>
+ listen 443 ssl default_server;
+ listen [::]:443 ssl default_server;
+ <% else %>
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ <% end %>
+
ssl_certificate sites-available/adblockplus.org_sslcert.pem;
ssl_certificate_key sites-available/adblockplus.org_sslcert.key;
gzip on;
gzip_min_length 1000;
gzip_types application/json text/css application/x-javascript;
sendfile on;
« no previous file with comments | « modules/discourse/templates/discourse.conf.erb ('k') | modules/private-stub/manifests/discourse.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld