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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 } | 90 } |
91 } | 91 } |
92 } | 92 } |
93 | 93 |
94 # Work around https://projects.puppetlabs.com/issues/4145 | 94 # Work around https://projects.puppetlabs.com/issues/4145 |
95 Sshkey<| |> -> | 95 Sshkey<| |> -> |
96 file {'/etc/ssh/ssh_known_hosts': | 96 file {'/etc/ssh/ssh_known_hosts': |
97 ensure => 'present', | 97 ensure => 'present', |
98 mode => 0644, | 98 mode => 0644, |
99 } | 99 } |
| 100 |
| 101 # Work around https://issues.adblockplus.org/ticket/3479 |
| 102 if $::environment == 'development' { |
| 103 |
| 104 file { |
| 105 '/etc/ssh/ssh_host_rsa_key': |
| 106 source => 'puppet:///modules/base/development_host_rsa_key', |
| 107 mode => 600, |
| 108 notify => Service['ssh']; |
| 109 '/etc/ssh/ssh_host_rsa_key.pub': |
| 110 source => 'puppet:///modules/base/development_host_rsa_key.pub', |
| 111 mode => 644; |
| 112 } |
| 113 } |
100 } | 114 } |
101 | |
OLD | NEW |