X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=86094b1a90bdb2b319c42d6ba3b9a013e54a1520;hb=3eb533e5499e66423bafdedaf6c7d08ead1772de;hp=81bdb893ddb3f6829bc479caebb3d4b4eff9a63d;hpb=5244957c0cd8b29cd15fc7cd55dc996dbb9ced3a;p=dsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 81bdb893..86094b1a 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,57 +1,46 @@
 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,
-          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.client.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
+	}
 
-    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,
+		mode   => '0750',
+	}
+	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   => '0640'
+	}
+	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',
+	}
+
+	exec { 'c_rehash /etc/ssl/debian/certs':
+		refreshonly => true,
+	}
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: