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

Unified Diff: modules/discourse_docker/files/site.conf

Issue 29370691: Issue 4234 - New discourse module based on docker (Closed)
Patch Set: add empty line at eof Created Jan. 6, 2017, 3:40 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 | « no previous file | modules/discourse_docker/manifests/init.pp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/discourse_docker/files/site.conf
diff --git a/modules/adblockplus/files/nginx/buildmaster.conf b/modules/discourse_docker/files/site.conf
similarity index 66%
copy from modules/adblockplus/files/nginx/buildmaster.conf
copy to modules/discourse_docker/files/site.conf
index 5f516fad73b2269e4e56f85893e9f2c0016862da..6e4495ca0997b366671938192273e852d03e540d 100644
--- a/modules/adblockplus/files/nginx/buildmaster.conf
+++ b/modules/discourse_docker/files/site.conf
@@ -1,10 +1,10 @@
-# Forward requests to the local builbot master
location /
{
- proxy_pass http://127.0.0.1:8010/;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $http_host;
+ proxy_http_version 1.1;
+ proxy_pass http://unix:/var/discourse/shared/standalone/nginx.http.sock:;
}
« no previous file with comments | « no previous file | modules/discourse_docker/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld