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

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

Issue 29337881: Issue 3574 - Move workaround for #3479 from class base to adblockplus (Closed)
Patch Set: Created March 6, 2016, 7:32 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 | « no previous file | modules/base/manifests/init.pp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # == Class: adblockplus 1 # == Class: adblockplus
2 # 2 #
3 # The adblockplus class and the associated adblockplus:: namespace are 3 # The adblockplus class and the associated adblockplus:: namespace are
4 # used to integrate Puppet modules with each other, in order to assemble 4 # used to integrate Puppet modules with each other, in order to assemble
5 # the setups used by the Adblock Plus project. 5 # the setups used by the Adblock Plus project.
6 # 6 #
7 # === Parameters: 7 # === Parameters:
8 # 8 #
9 # [*authority*] 9 # [*authority*]
10 # The authorative domain or zone associated with the current environment, 10 # The authorative domain or zone associated with the current environment,
(...skipping 27 matching lines...) Expand all
38 $directory = '/var/adblockplus' 38 $directory = '/var/adblockplus'
39 39
40 # A common location for directories specific to the adblockplus:: setups, 40 # A common location for directories specific to the adblockplus:: setups,
41 # managed via Puppet, but accessible by all users with access to the system 41 # managed via Puppet, but accessible by all users with access to the system
42 @file {$directory: 42 @file {$directory:
43 ensure => 'directory', 43 ensure => 'directory',
44 mode => 0755, 44 mode => 0755,
45 owner => 'root', 45 owner => 'root',
46 } 46 }
47 47
48 # Work around https://issues.adblockplus.org/ticket/3479
49 if $::environment == 'development' {
50
51 file {
52 '/etc/ssh/ssh_host_rsa_key':
53 source => 'puppet:///modules/base/development_host_rsa_key',
Fred 2016/03/07 12:11:29 Shouldn't we also change the file source to the ad
mathias 2016/03/07 14:13:53 Acknowledged.
54 mode => 600,
55 notify => Service['ssh'];
56 '/etc/ssh/ssh_host_rsa_key.pub':
57 source => 'puppet:///modules/base/development_host_rsa_key.pub',
58 mode => 644;
59 }
60 }
61
48 # See modules/adblockplus/manifests/user.pp 62 # See modules/adblockplus/manifests/user.pp
49 create_resources('adblockplus::user', $users) 63 create_resources('adblockplus::user', $users)
50 } 64 }
OLDNEW
« no previous file with comments | « no previous file | modules/base/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld