Side by Side Diff: modules/nginx/templates/site.erb
Issue 5731052198821888:
#1203 - Establish nginx::hostconfig-fragment() directive (Closed)
Patch Set: #1203 - Establish nginx::hostconfig-fragment() directive
Created Aug. 18, 2014, 10:01 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/nginx/manifests/init.pp ('k')
|
modules/trac/manifests/init.pp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 <% include_file = lambda do |url| %> | 1 <% include_file = lambda do |url| %> |
| 2 <% content = Puppet::FileServing::Content.indirection.find(url) %> | 2 <% content = Puppet::FileServing::Content.indirection.find(url) %> |
| 3 <% if content %> | 3 <% if content %> |
| 4 <%= content.content %> | 4 <%= content.content %> |
| 5 <% else %> | 5 <% else %> |
| 6 <% raise StandardError, "Failed to resolve source URL #{url}" %> | 6 <% raise StandardError, "Failed to resolve source URL #{url}" %> |
| 7 <% end %> | 7 <% end %> |
| 8 <% end %> | 8 <% end %> |
| 9 | 9 |
| 10 <% server_name = lambda do |domain, alt_names| %><%= domain %><% @alt_names.each do |name| %>, <%= name %><% end %><% end %> | 10 <% server_name = lambda do |domain, alt_names| %><%= domain %><% @alt_names.each do |name| %>, <%= name %><% end %><% end %> |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 71 root /usr/share/nginx/html; | 71 root /usr/share/nginx/html; |
| 72 } | 72 } |
| 73 | 73 |
| 74 <% if @content %> | 74 <% if @content %> |
| 75 <%= content %> | 75 <%= content %> |
| 76 <% end %> | 76 <% end %> |
| 77 | 77 |
| 78 <% if @source %> | 78 <% if @source %> |
| 79 <% include_file[source] %> | 79 <% include_file[source] %> |
| 80 <% end %> | 80 <% end %> |
| 81 | |
| 82 # include any fragments provided via puppet and nginx::hostconfig-fragment | |
| 83 include "<%= scope.lookupvar('nginx::fragment_directory') %>/<%= domain %>/*.con f"; | |
| 84 | |
| 81 } | 85 } |
| OLD | NEW |
« no previous file with comments
|
« modules/nginx/manifests/init.pp ('k')
|
modules/trac/manifests/init.pp » ('j')
|
no next file with comments »
