X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=3d37fb866af05c0261d144ac7ff013bd0f2ba5d2;hb=4275a39fd0805ec013ff807c8c15aa10af2baa5c;hp=7cd1583084504910b3548e672af8368afe591aa8;hpb=6fa2680c82607d511aa6933a7b1e010e78b42860;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 7cd158308..3d37fb866 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,60 +1,66 @@
 class ssl {
-    package { openssl: ensure => installed }
 
-    file {
-        "/etc/ssl/debian":
-          ensure  => directory,
-          mode    => 755,
-          purge   => true
-          recurse => true,
-          force   => true,
-          source  => "puppet:///files/empty/"
-        ;
-        "/etc/ssl/debian/certs":
-          ensure  => directory,
-          mode    => 755,
-          purge   => true,
-          force   => true,
-          recurse => true,
-          source  => "puppet:///files/empty/"
-        ;
-        "/etc/ssl/debian/crls":
-          ensure  => directory,
-          mode    => 755,
-          purge   => true,
-          force   => true,
-          recurse => true,
-          source  => "puppet:///files/empty/"
-        ;
-        "/etc/ssl/debian/keys":
-          ensure  => directory,
-          mode    => 750,
-          purge   => true
-          force   => true,
-          recurse => true,
-          source  => "puppet:///files/empty/"
-        ;
-        "/etc/ssl/debian/certs/thishost.crt":
-          source  => "puppet:///ssl/clientcerts/$fqdn.crt",
-          notify  => Exec["c_rehash /etc/ssl/debian/certs"],
-          ;
-        "/etc/ssl/debian/keys/thishost.key":
-          source  => "puppet:///ssl/clientcerts/$fqdn.key",
-          mode    => 640
-          ;
-        "/etc/ssl/debian/certs/ca.crt":
-          source  => "puppet:///ssl/clientcerts/ca.crt",
-          notify  => Exec["c_rehash /etc/ssl/debian/certs"],
-          ;
-        "/etc/ssl/debian/crls/ca.crl":
-          source  => "puppet:///ssl/clientcerts/ca.crl",
-          ;
-    }
+	package {
+		'openssl':
+			ensure => installed,
+			;
+		'ssl-cert':
+			ensure => installed,
+			;
+	}
 
-    exec { "c_rehash /etc/ssl/debian/certs":
-        refreshonly => true,
-    }
+	file { '/etc/ssl/debian':
+		ensure  => directory,
+		mode    => '0755',
+		purge   => true,
+		recurse => true,
+		force   => true,
+		source  => 'puppet:///files/empty/'
+	}
+	file { '/etc/ssl/debian/certs':
+		ensure => directory,
+		mode   => '0755',
+	}
+	file { '/etc/ssl/debian/crls':
+		ensure => directory,
+		mode   => '0755',
+	}
+	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",
+		notify => Exec['c_rehash /etc/ssl/debian/certs'],
+	}
+	file { '/etc/ssl/debian/keys/thishost.key':
+		source => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
+		mode   => '0440',
+		group   => ssl-cert,
+		require => Package['ssl-cert'],
+	}
+	file { '/etc/ssl/debian/certs/ca.crt':
+		source => 'puppet:///modules/ssl/clientcerts/ca.crt',
+		notify => Exec['c_rehash /etc/ssl/debian/certs'],
+	}
+	file { '/etc/ssl/debian/crls/ca.crl':
+		source  => 'puppet:///modules/ssl/clientcerts/ca.crl',
+	}
+
+	file { '/etc/ssl/debian/certs/thishost-server.crt':
+		source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
+		notify => Exec['c_rehash /etc/ssl/debian/certs'],
+	}
+	file { '/etc/ssl/debian/keys/thishost-server.key':
+		source  => "puppet:///modules/exim/certs/${::fqdn}.key",
+		mode    => '0440',
+		group   => ssl-cert,
+		require => Package['ssl-cert'],
+	}
+
+	exec { 'c_rehash /etc/ssl/debian/certs':
+		refreshonly => true,
+	}
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: