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

Unified 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.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | modules/base/manifests/init.pp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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..c39715d1a104624d6d32b2cb209fa4cc9100e81b 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/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.
+ mode => 600,
+ notify => Service['ssh'];
+ '/etc/ssh/ssh_host_rsa_key.pub':
+ source => 'puppet:///modules/base/development_host_rsa_key.pub',
+ mode => 644;
+ }
+ }
+
# See modules/adblockplus/manifests/user.pp
create_resources('adblockplus::user', $users)
}
« 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