modules/nginx/templates/site.erb - Issue 5731052198821888: #1203 - Establish nginx::hostconfig-fragment() directive

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

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. 13, 2014, 9:49 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

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