Delta Between Two Patch Sets: modules/adblockplus/manifests/init.pp
Issue 29337881:
Issue 3574 - Move workaround for #3479 from class base to adblockplus (Closed)
Left Patch Set:
Created March 6, 2016, 7:32 p.m.
Right 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.
« no previous file with change/comment
|
« modules/adblockplus/files/development_host_rsa_key.pub ('k')
|
modules/base/files/development_host_rsa_key » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 | 48 # Work around https://issues.adblockplus.org/ticket/3479 |
| 49 if $::environment == 'development' { | 49 if $::environment == 'development' { |
| 50 | 50 |
| 51 file { | 51 file { |
| 52 '/etc/ssh/ssh_host_rsa_key': | 52 '/etc/ssh/ssh_host_rsa_key': |
| 53 source => 'puppet:///modules/base/development_host_rsa_key', | 53 source => 'puppet:///modules/adblockplus/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, | 54 mode => 600, |
| 55 notify => Service['ssh']; | 55 notify => Service['ssh']; |
| 56 '/etc/ssh/ssh_host_rsa_key.pub': | 56 '/etc/ssh/ssh_host_rsa_key.pub': |
| 57 source => 'puppet:///modules/base/development_host_rsa_key.pub', | 57 source => 'puppet:///modules/adblockplus/development_host_rsa_key.pub', |
| 58 mode => 644; | 58 mode => 644; |
| 59 } | 59 } |
| 60 } | 60 } |
| 61 | 61 |
| 62 # See modules/adblockplus/manifests/user.pp | 62 # See modules/adblockplus/manifests/user.pp |
| 63 create_resources('adblockplus::user', $users) | 63 create_resources('adblockplus::user', $users) |
| 64 } | 64 } |
| LEFT | RIGHT |
« modules/adblockplus/files/development_host_rsa_key.pub ('k')
|
modules/base/files/development_host_rsa_key » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
