Side by Side Diff: modules/base/manifests/init.pp
Issue 5785509448122368:
Issue 2588 - Provide correct key types in /etc/ssh/ssh_known_hosts (Closed)
Patch Set:
Created May 26, 2015, 3:32 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 class base ($zone='adblockplus.org') { | 1 class base ($zone='adblockplus.org') { |
| 2 stage {'pre': before => Stage['main']} | 2 stage {'pre': before => Stage['main']} |
| 3 stage {'post': require => Stage['main']} | 3 stage {'post': require => Stage['main']} |
| 4 | 4 |
| 5 class {'users': | 5 class {'users': |
| 6 stage => 'pre', | 6 stage => 'pre', |
| 7 } | 7 } |
| 8 | 8 |
| 9 if !defined(Class['apt']) { | 9 if !defined(Class['apt']) { |
| 10 class {'apt': | 10 class {'apt': |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 76 if $ssh_public_key != undef { | 76 if $ssh_public_key != undef { |
| 77 | 77 |
| 78 $name_key = $dns ? { | 78 $name_key = $dns ? { |
| 79 undef => $fqdn_name, | 79 undef => $fqdn_name, |
| 80 default => $dns, | 80 default => $dns, |
| 81 } | 81 } |
| 82 | 82 |
| 83 @sshkey {$name: | 83 @sshkey {$name: |
| 84 name => $name_key, | 84 name => $name_key, |
| 85 key => $ssh_public_key, | 85 key => $ssh_public_key, |
| 86 type => ssh-rsa, | 86 type => 'ecdsa-sha2-nistp256', |
| 87 host_aliases => $ip, | 87 host_aliases => $ip, |
| 88 tag => 'base::explicit_host_record', | 88 tag => 'base::explicit_host_record', |
| 89 } | 89 } |
| 90 } | 90 } |
| 91 } | 91 } |
| 92 | 92 |
| 93 # Work around https://projects.puppetlabs.com/issues/4145 | 93 # Work around https://projects.puppetlabs.com/issues/4145 |
| 94 Sshkey<| |> -> | 94 Sshkey<| |> -> |
| 95 file {'/etc/ssh/ssh_known_hosts': | 95 file {'/etc/ssh/ssh_known_hosts': |
| 96 ensure => 'present', | 96 ensure => 'present', |
| 97 mode => 0644, | 97 mode => 0644, |
| 98 } | 98 } |
| 99 } | 99 } |
| 100 | 100 |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
