From 794666145e1d4becf83e08905d1c8a5c13ec62ab Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 11 Apr 2013 21:51:20 -0300 Subject: SSH key management should be done elsewhere --- manifests/instance.pp | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'manifests/instance.pp') diff --git a/manifests/instance.pp b/manifests/instance.pp index d51755f..068b2df 100644 --- a/manifests/instance.pp +++ b/manifests/instance.pp @@ -10,8 +10,7 @@ define ikiwiki::instance( $protocol = 'https', $owner = $name, $group = $name, - $home = "/home/$owner", - $create_ssh_key = false + $home = "/home/$owner" ) { case $ensure { 'present': { @@ -77,25 +76,6 @@ define ikiwiki::instance( "${ikiwiki::sites_folder}/${name}/ikiwiki", "${ikiwiki::sites_folder}/${name}/ikiwiki_src"], } - - if $create_ssh_key == true { - if !defined(File["${home}/.ssh"]) { - file { "${home}/.ssh": - ensure => directory, - owner => $owner, - group => $group, - mode => 0700, - } - } - - exec { "ssh-keygen-ikiwiki-${owner}": - command => "ssh-keygen -t rsa -P '' -f ${home}/.ssh/id_rsa", - creates => "${home}/.ssh/id_rsa", - user => $owner, - group => $group, - require => File["${home}/.ssh"], - } - } } 'absent': { file { "/etc/ikiwiki/$name.setup": -- cgit v1.2.3