Merge pull request #750 from alexharv074/Issue_749

Issue_749  Add 'managed by puppet' to config files
This commit is contained in:
Matthew Haughton 2016-02-03 11:32:47 -05:00
commit 955c685395
9 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,4 @@
# MANAGED BY PUPPET
<%
# sorting ip addresses in ascending order is more efficient for nginx - so we need
# to convert them to numbers first via IPAddr

View file

@ -1,3 +1,4 @@
# MANAGED BY PUPPET
map <%= @string %> $<%= @name %> {
<% if @hostnames -%>
hostnames;

View file

@ -1,3 +1,4 @@
# MANAGED BY PUPPET
<% if @super_user -%>
user <%= @daemon_user %>;
<% end -%>

View file

@ -1,3 +1,4 @@
# MANAGED BY PUPPET
upstream <%= @name %> {
<% if @upstream_cfg_prepend -%><% @upstream_cfg_prepend.sort_by{|k,v| k}.each do |key,value| %>
<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>

View file

@ -1,4 +1,4 @@
# MANAGED BY PUPPET
server {
<%- if @listen_ip.is_a?(Array) then -%>
<%- @listen_ip.each do |ip| -%>

View file

@ -1,4 +1,4 @@
# MANAGED BY PUPPET
server {
<%- if @listen_ip.is_a?(Array) then -%>
<%- @listen_ip.each do |ip| -%>

View file

@ -1,3 +1,4 @@
# MANAGED BY PUPPET
server {
<%- if @listen_ip.is_a?(Array) then -%>
<%- @listen_ip.each do |ip| -%>

View file

@ -1,3 +1,4 @@
# MANAGED BY PUPPET
<% if @rewrite_www_to_non_www -%>
<%- @server_name.each do |s| -%>
server {

View file

@ -1,3 +1,4 @@
# MANAGED BY PUPPET
<% if @rewrite_www_to_non_www -%>
<%- @server_name.each do |s| -%>
server {