Ossi Salmi 49a8ae3004 Merge branch 'puppet3' ... Conflicts: ntpd/templates/ntp.conf.erb wiki/templates/collab-wsgi.conf.erb		2013-05-24 10:10:57 +03:00
..
files	nagios: Added LDAP and LDAPs service targets.	2013-05-10 23:55:22 +03:00
manifests	nagios: Fixed hostname from nagios::target::nrpe::service.	2013-05-14 09:03:46 +03:00
templates	Updated all templates to use instance variables	2013-05-05 00:07:55 +03:00