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

Unified Diff: modules/hgweb/templates/nginx.conf.erb

Issue 29324553: Issue 2909 - Allow for adjusting the location of $hgweb::templates (Closed)
Patch Set: Created Aug. 24, 2015, 5:36 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
« modules/hgweb/manifests/init.pp ('K') | « modules/hgweb/manifests/init.pp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/hgweb/templates/nginx.conf.erb
diff --git a/modules/hgweb/files/nginx.conf b/modules/hgweb/templates/nginx.conf.erb
similarity index 58%
rename from modules/hgweb/files/nginx.conf
rename to modules/hgweb/templates/nginx.conf.erb
index f97a73b099701108db7e806f8d6b12aaf74f1575..ff7478d68c8f8549efb41b46004ccaaa5f9e1b26 100644
--- a/modules/hgweb/files/nginx.conf
+++ b/modules/hgweb/templates/nginx.conf.erb
@@ -1,6 +1,5 @@
-add_header Strict-Transport-Security "max-age=2592000";
-
-location / {
+location /
+{
root /home/hg/web;
rewrite ^/customization/(.*) /abpcustomization/$1 permanent;
fastcgi_pass unix:/var/run/hgweb.sock;
@@ -8,10 +7,12 @@ location / {
fastcgi_param SCRIPT_NAME "";
}
-location /static/ {
- root /usr/share/mercurial/templates;
+location /static/
+{
+ root <%= @templates %>;
}
-location /robots.txt {
+location /robots.txt
+{
root /home/hg/web;
}
« modules/hgweb/manifests/init.pp ('K') | « modules/hgweb/manifests/init.pp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld