X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=3d37fb866af05c0261d144ac7ff013bd0f2ba5d2;hb=1cf55805ae9d1a9cbc8bd935a52d8eea1914f8d4;hp=614e3586a9c48c8263ec0704b9c2c5bc7159e84e;hpb=1adc02a511477cc9059e561ff947612376044f54;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 614e3586a..3d37fb866 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,7 +1,12 @@
 class ssl {
 
-	package { 'openssl':
-		ensure => installed
+	package {
+		'openssl':
+			ensure => installed,
+			;
+		'ssl-cert':
+			ensure => installed,
+			;
 	}
 
 	file { '/etc/ssl/debian':
@@ -24,6 +29,7 @@ class ssl {
 		ensure => directory,
 		group  => ssl-cert,
 		mode   => '0750',
+		require => Package['ssl-cert'],
 	}
 	file { '/etc/ssl/debian/certs/thishost.crt':
 		source => "puppet:///modules/ssl/clientcerts/${::fqdn}.client.crt",
@@ -31,7 +37,9 @@ class ssl {
 	}
 	file { '/etc/ssl/debian/keys/thishost.key':
 		source => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
-		mode   => '0440'
+		mode   => '0440',
+		group   => ssl-cert,
+		require => Package['ssl-cert'],
 	}
 	file { '/etc/ssl/debian/certs/ca.crt':
 		source => 'puppet:///modules/ssl/clientcerts/ca.crt',
@@ -47,8 +55,9 @@ class ssl {
 	}
 	file { '/etc/ssl/debian/keys/thishost-server.key':
 		source  => "puppet:///modules/exim/certs/${::fqdn}.key",
-		group   => ssl-cert,
 		mode    => '0440',
+		group   => ssl-cert,
+		require => Package['ssl-cert'],
 	}
 
 	exec { 'c_rehash /etc/ssl/debian/certs':