tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'puppet3'

Browse source 
Conflicts:
	ntpd/templates/ntp.conf.erb
	wiki/templates/collab-wsgi.conf.erb
This commit is contained in:
Ossi Salmi 2013-05-24 10:10:57 +03:00
commit 49a8ae3004
112 changed files with 522 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

4
snmp/templates/snmptrapd.conf.erb
View file

@ -1,9 +1,9 @@
pidFile /var/run/snmptrapd.pid
<% if acl == 'NONE' -%>
<% if @acl == 'NONE' -%>
disableAuthorization yes
<% else -%>
<% acl.each do |rule| -%>
<% @acl.each do |rule| -%>
authCommunity log <%= rule %>
<% end -%>
<% end -%>