Unified Diff: modules/adblockplus/templates/web/static.conf.erb
Issue 29689695:
#7320 - Introduce helpcenter role (Closed)
Patch Set:
Created Feb. 5, 2018, 5:59 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/adblockplus/manifests/web/static.pp ('k')
|
modules/adblockplus/templates/web/static_deploy_script.sh.erb » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/adblockplus/templates/web/static.conf.erb |
| diff --git a/modules/web/templates/site.conf.erb b/modules/adblockplus/templates/web/static.conf.erb |
| similarity index 85% |
| copy from modules/web/templates/site.conf.erb |
| copy to modules/adblockplus/templates/web/static.conf.erb |
| index 66f4b189592047da3f1104b9373e81162b53860f..35ee637259d9007090eccb479716d8a87d63dc59 100644 |
| --- a/modules/web/templates/site.conf.erb |
| +++ b/modules/adblockplus/templates/web/static.conf.erb |
| @@ -1,5 +1,7 @@ |
| -root /var/www/<%= @vhost %>; |
| -index index; |
| +# Puppet: <%= @title %> |
| + |
| +root /var/www/<%= @domain %>; |
| +index index index.html; |
| default_type text/html; |
| charset utf-8; |
| @@ -75,13 +77,3 @@ location ~ ^/([a-z][a-z])(/.+) |
| rewrite ^/([a-z][a-z])(/.+) $2 redirect; |
| } |
| } |
| - |
| -<% if @multiplexer_locations %> |
| - <% @multiplexer_locations.each do |location| %> |
| - location <%= location %> |
| - { |
| - fastcgi_pass unix:/tmp/multiplexer-fastcgi.sock; |
| - include /etc/nginx/fastcgi_params; |
| - } |
| - <% end %> |
| -<% end %> |
« no previous file with comments
|
« modules/adblockplus/manifests/web/static.pp ('k')
|
modules/adblockplus/templates/web/static_deploy_script.sh.erb » ('j')
|
no next file with comments »
