diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-04-11 21:51:20 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-04-11 21:51:20 -0300 |
| commit | 794666145e1d4becf83e08905d1c8a5c13ec62ab (patch) | |
| tree | a4bd76f6bc2f3f0ac2744d51fbea7b066e166462 /manifests/instance.pp | |
| parent | deb0f9d2bb3efb6addfec6fa9f051abc9bd215ee (diff) | |
| download | puppet-ikiwiki-794666145e1d4becf83e08905d1c8a5c13ec62ab.tar.gz puppet-ikiwiki-794666145e1d4becf83e08905d1c8a5c13ec62ab.tar.bz2 | |
SSH key management should be done elsewhere
Diffstat (limited to 'manifests/instance.pp')
| -rw-r--r-- | manifests/instance.pp | 22 |
1 files changed, 1 insertions, 21 deletions
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": |