8d33fd63f1
Conflicts: manifests/config.pp manifests/init.pp manifests/params.pp manifests/resource/location.pp manifests/resource/vhost.pp manifests/service.pp templates/vhost/vhost_footer.erb templates/vhost/vhost_header.erb templates/vhost/vhost_location_directory.erb templates/vhost/vhost_location_proxy.erb templates/vhost/vhost_ssl_header.erb tests/vhost.pp
17 lines
460 B
Text
17 lines
460 B
Text
<% if @include_files %><% @include_files.each do |file| -%>
|
|
include <%= file %>;
|
|
<% end -%><% end -%>
|
|
|
|
<% if @vhost_cfg_append -%><% vhost_cfg_append.each do |key,value| -%>
|
|
<%= key %> <%= value %>;
|
|
<% end -%><% end -%>
|
|
|
|
}
|
|
|
|
<% if rewrite_www_to_non_www %>
|
|
server {
|
|
listen <%= listen_ip %>;
|
|
server_name www.<%= name.gsub(/^www\./, '') %>;
|
|
rewrite ^ http://<%= name.gsub(/^www\./, '') %>$uri permanent;
|
|
}
|
|
<% end %>
|