X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fportforwarder%2Fmanifests%2Finit.pp;h=9cb62f60724bf3d45f2efc176744b3582896832f;hb=9728596ba8cf819fe5255eb2aee9b2c469b8359c;hp=e7009b22e986313cff3af8d3ec155b534b048b30;hpb=5c238454bf1dc71195fddac8eaaf83d89da4930b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/portforwarder/manifests/init.pp b/modules/portforwarder/manifests/init.pp
index e7009b22e..9cb62f607 100644
--- a/modules/portforwarder/manifests/init.pp
+++ b/modules/portforwarder/manifests/init.pp
@@ -2,28 +2,32 @@ class portforwarder {
 	# do not depend on xinetd, yet.  it might uninstall other inetds
 	# for now this will have to be done manually
 
-	if ! $::portforwarder_key {
-		exec { 'create-portforwarder-key':
-			command => '/bin/su - portforwarder -c \'mkdir -p -m 02700 .ssh && ssh-keygen -C "`whoami`@`hostname` (`date +%Y-%m-%d`)" -P "" -f .ssh/id_rsa -q\'',
-			onlyif  => '/usr/bin/getent passwd portforwarder > /dev/null && ! [ -e /home/portforwarder/.ssh/id_rsa ]'
-		}
-	}
+	if $::portforwarder_user_exists {
+		ssh::keygen {'portforwarder': }
 
-	file { '/etc/ssh/userkeys/portforwarder':
-		content => template('portforwarder/authorized_keys.erb'),
-	}
-	file { '/etc/xinetd.d':
-		ensure  => directory,
-		owner   => root,
-		group   => root,
-		mode    => '0755',
-	}
-	file { '/etc/xinetd.d/dsa-portforwader':
-		content => template('portforwarder/xinetd.erb'),
-		notify  => Exec['service xinetd reload']
-	}
+		file { '/etc/ssh/userkeys/portforwarder':
+			content => template('portforwarder/authorized_keys.erb'),
+		}
+		file { '/etc/xinetd.d':
+			ensure  => directory,
+			owner   => root,
+			group   => root,
+			mode    => '0755',
+		}
+		file { '/etc/xinetd.d/dsa-portforwader':
+			content => template('portforwarder/xinetd.erb'),
+			notify  => Exec['service xinetd reload']
+		}
 
-	exec { 'service xinetd reload':
-		refreshonly => true,
+		exec { 'service xinetd reload':
+			refreshonly => true,
+		}
+	} else {
+		file { [
+			'/etc/ssh/userkeys/portforwarder',
+			'/etc/xinetd.d/dsa-portforwader',
+			]:
+			ensure => 'absent',
+		}
 	}
 }