puppet/apache
Ossi Salmi 98767cfb2a Merge tmakinen/puppet
Conflicts:
	dovecot/manifests/init.pp
	libvirt/manifests/init.pp
	munin/manifests/init.pp
	puppet/manifests/init.pp
	tftp/manifests/init.pp
2012-11-16 19:40:31 +02:00
..
files Fixed description from httpsd service file. 2012-06-13 22:53:00 +03:00
manifests Added support for RHEL and did some syntax cleaning 2012-09-05 17:29:36 +03:00
templates Merge tmakinen/puppet 2012-11-16 19:40:31 +02:00