Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/base/manifests/init.pp

Issue 29337881: Issue 3574 - Move workaround for #3479 from class base to adblockplus (Closed)
Patch Set: Issue 3574 - Move development RSA keys to module adblockplus Created March 7, 2016, 2:13 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « modules/base/files/development_host_rsa_key.pub ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 }
114 } 100 }
OLDNEW
« no previous file with comments | « modules/base/files/development_host_rsa_key.pub ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld