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

16
yum/templates/yum.repo.erb
View file

@ -1,14 +1,14 @@
[<%= name %>]
name=<%= descr_real %>
enabled=<% if status == 'disable' %>0<% else %>1<% end %>
<% if baseurl != '' -%>
baseurl=<%= baseurl %>
[<%= @name %>]
name=<%= @descr_real %>
enabled=<% if @status == 'disable' %>0<% else %>1<% end %>
<% if @baseurl != '' -%>
baseurl=<%= @baseurl %>
<% else -%>
mirrorlist=<%= mirrorlist %>
mirrorlist=<%= @mirrorlist %>
<% end -%>
<% if gpgkey_real != '' -%>
<% if @gpgkey_real != '' -%>
gpgcheck=1
gpgkey=<%= gpgkey_real %>
gpgkey=<%= @gpgkey_real %>
<% else -%>
gpgcheck=0
<% end -%>