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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 => ssh-rsa, |
87 host_aliases => $ip, | 87 host_aliases => $ip, |
| 88 tag => 'base::explicit_host_record', |
88 } | 89 } |
89 } | 90 } |
| 91 } |
90 | 92 |
| 93 # Work around https://projects.puppetlabs.com/issues/4145 |
| 94 Sshkey<| |> -> |
| 95 file {'/etc/ssh/ssh_known_hosts': |
| 96 ensure => 'present', |
| 97 mode => 0644, |
91 } | 98 } |
92 } | 99 } |
93 | 100 |
OLD | NEW |