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

2
ntpd/templates/chrony.conf.erb
View file

@ -1,5 +1,5 @@
# Remote servers.
<% ntp_server.each do |server| -%>
<% @ntp_server.each do |server| -%>
server <%= server %> iburst
<% end -%>

2
ntpd/templates/openntpd.conf.erb
View file

@ -9,7 +9,7 @@ listen on *
# use a random selection of NTP Pool Time Servers
# see http://support.ntp.org/bin/view/Servers/NTPPoolServers
<% ntp_server.each do |server| -%>
<% @ntp_server.each do |server| -%>
servers <%= server %>
<% end -%>