Unified Diff: modules/adblockplus/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.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/adblockplus/files/development_host_rsa_key.pub ('k')
|
modules/base/files/development_host_rsa_key » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/adblockplus/manifests/init.pp |
| diff --git a/modules/adblockplus/manifests/init.pp b/modules/adblockplus/manifests/init.pp |
| index c887d6471b20d1249917a0961cc0a673e2e9e52e..0a5392827448a4b40b2501aca97071b0ff3ff8b6 100644 |
| --- a/modules/adblockplus/manifests/init.pp |
| +++ b/modules/adblockplus/manifests/init.pp |
| @@ -45,6 +45,20 @@ class adblockplus ( |
| owner => 'root', |
| } |
| + # Work around https://issues.adblockplus.org/ticket/3479 |
| + if $::environment == 'development' { |
| + |
| + file { |
| + '/etc/ssh/ssh_host_rsa_key': |
| + source => 'puppet:///modules/adblockplus/development_host_rsa_key', |
| + mode => 600, |
| + notify => Service['ssh']; |
| + '/etc/ssh/ssh_host_rsa_key.pub': |
| + source => 'puppet:///modules/adblockplus/development_host_rsa_key.pub', |
| + mode => 644; |
| + } |
| + } |
| + |
| # See modules/adblockplus/manifests/user.pp |
| create_resources('adblockplus::user', $users) |
| } |
« no previous file with comments
|
« modules/adblockplus/files/development_host_rsa_key.pub ('k')
|
modules/base/files/development_host_rsa_key » ('j')
|
no next file with comments »
