Unified Diff: modules/adblockplus/manifests/init.pp
Issue 29338036:
Issue 3574 - Move APT setup from class base to module adblockplus (Closed)
Patch Set: Issue 3574 - Fix typo: $enfironment => $environment
Created March 9, 2016, 7:33 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« 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') | 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 300c20c3c59e4aeca228f5fe672085c0ae88798f..bc6532172d24f4b5c34b03d5bef2ad95cf7f7c67 100644 |
| --- a/modules/adblockplus/manifests/init.pp |
| +++ b/modules/adblockplus/manifests/init.pp |
| @@ -34,6 +34,11 @@ class adblockplus ( |
| zone => $authority, |
| } |
| + # Class['apt'] cannot yet be configured to update on-demand |
| + class {'apt': |
| + always_apt_update => ($environment != 'development'), |
| + } |
| + |
| # Used as internal constant within adblockplus::* resources |
| $directory = '/var/adblockplus' |
| @@ -75,6 +80,9 @@ class adblockplus ( |
| } |
| } |
| + # Fix implicit package dependency Class['apt'] does not properly handle |
| + Exec['apt_update'] -> Package<|title != 'python-software-properties'|> |
| + |
| # 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 »
