X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=3d37fb866af05c0261d144ac7ff013bd0f2ba5d2;hb=67b962b1158fb77c22dc8b11426e1666aee3d32b;hp=d16754f6f336ad94c838e2a34cc699f39980b892;hpb=4b8d1db6ced85aa3b830350f838bba4d8b69ea42;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index d16754f6f..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':
@@ -22,7 +27,9 @@ class ssl {
 	}
 	file { '/etc/ssl/debian/keys':
 		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",
@@ -30,7 +37,9 @@ class ssl {
 	}
 	file { '/etc/ssl/debian/keys/thishost.key':
 		source => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
-		mode   => '0640'
+		mode   => '0440',
+		group   => ssl-cert,
+		require => Package['ssl-cert'],
 	}
 	file { '/etc/ssl/debian/certs/ca.crt':
 		source => 'puppet:///modules/ssl/clientcerts/ca.crt',
@@ -44,10 +53,11 @@ class ssl {
 		source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
 		notify => Exec['c_rehash /etc/ssl/debian/certs'],
 	}
-	file { '/etc/ssl/debian/certs/thishost-server.key':
+	file { '/etc/ssl/debian/keys/thishost-server.key':
 		source  => "puppet:///modules/exim/certs/${::fqdn}.key",
+		mode    => '0440',
 		group   => ssl-cert,
-		mode    => '0640',
+		require => Package['ssl-cert'],
 	}
 
 	exec { 'c_rehash /etc/ssl/debian/certs':