X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Fmanifests%2Finit.pp;h=1c0ea0155fcfc0127fe95b6600fce0519f21300a;hb=25cee51c183c4f8d97b380314ad50075bc7d04e6;hp=0bb9d0f6c00ee33a692dcfa280d92d8d4b9f7ebc;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp
index 0bb9d0f6c..1c0ea0155 100644
--- a/modules/sudo/manifests/init.pp
+++ b/modules/sudo/manifests/init.pp
@@ -1,18 +1,40 @@
+# Debian.org's sudo setup
 class sudo {
+  ensure_packages ( [
+   'sudo',
+   'libpam-pwdfile',
+  ], {
+     ensure => 'installed',
+  })
 
-	package { 'sudo':
-		ensure => installed
-	}
+  file { '/etc/pam.d/sudo':
+    source  => 'puppet:///modules/sudo/pam',
+    require => Package['sudo'],
+  }
 
-	file { '/etc/pam.d/sudo':
-		source  => 'puppet:///modules/sudo/common/pam',
-		require => Package['sudo'],
-	}
+  file { '/etc/sudoers':
+    mode    => '0440',
+    source  => 'puppet:///modules/sudo/sudoers',
+    require => Package['sudo'],
+  }
 
-	file { '/etc/sudoers':
-		mode    => '0440',
-		source  => [ "puppet:///modules/sudo/sudoers.${::lsbdistcodename}",
-			'puppet:///modules/sudo/sudoers' ],
-		require => Package['sudo'],
-	}
+  file { '/etc/sudoers.d':
+    ensure  => directory,
+    mode    => '755',
+    purge   => true,
+    recurse => true,
+    force   => true,
+    source  => 'puppet:///files/empty/',
+  }
+  file { '/etc/sudoers.d/README':
+    mode    => '440',
+    content => @(EOT),
+      # According to the README shipped with Debian 10,
+      # this directory, if included in /etc/sudoers, needs
+      # to contain at least one file.  Files which end in
+      # a '~' character or that contain a '.' are ignored.
+      #
+      # Files should be mode 0440 and be edited with visudo.
+      | EOT
+  }
 }